From 28eae2a12aba9ef93e8c7912c7fb548d05d8ad16 Mon Sep 17 00:00:00 2001 From: eidheim Date: Sun, 3 Apr 2016 09:06:18 +0200 Subject: [PATCH] Additional checks to reopened folder and files at startup --- src/juci.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/juci.cc b/src/juci.cc index 1b15e30..5feb99e 100644 --- a/src/juci.cc +++ b/src/juci.cc @@ -52,15 +52,15 @@ void Application::on_activate() { boost::property_tree::ptree pt; boost::property_tree::read_json((Config::get().juci_home_path()/"last_session.json").string(), pt); auto folder=pt.get("folder"); - if(!folder.empty() && boost::filesystem::exists(folder)) + if(!folder.empty() && boost::filesystem::exists(folder) && boost::filesystem::is_directory(folder)) directories.emplace_back(folder); for(auto &v: pt.get_child("files")) { std::string file=v.second.data(); - if(!file.empty() && boost::filesystem::exists(file)) + if(!file.empty() && boost::filesystem::exists(file) && !boost::filesystem::is_directory(file)) files.emplace_back(file); } last_current_file=pt.get("current_file"); - if(!boost::filesystem::exists(last_current_file)) + if(!boost::filesystem::exists(last_current_file) || boost::filesystem::is_directory(last_current_file)) last_current_file.clear(); } catch(const std::exception &) {}