summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-10-05 08:55:25 -0400
committerGitHub <noreply@github.com>2019-10-05 08:55:25 -0400
commit73556ad0845ee6dea2ec9f1fa50903de0448fa91 (patch)
tree14670d7ce21598f7570de952ad104b2f3576010a /src/main.cpp
parent605b669bed0344fa6539a471a040d3ceeb24771c (diff)
parent76df854483c40cb7610d79c5540a5e67f554d840 (diff)
Merge pull request #852 from isanae/symlinks-log-only
Symlinks warning
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index fe5fd87a..a6918d99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -515,6 +515,10 @@ int runApplication(MOApplication &application, SingleInstance &instance,
const QString dataPath = application.property("dataPath").toString();
log::info("data path: {}", dataPath);
+ if (InstanceManager::isPortablePath(dataPath)) {
+ log::debug("this is a portable instance");
+ }
+
if (!bootstrap()) {
reportError("failed to set up data paths");
return 1;
@@ -531,6 +535,8 @@ int runApplication(MOApplication &application, SingleInstance &instance,
Settings settings(dataPath + "/" + QString::fromStdWString(AppConfig::iniFileName()));
log::getDefault().setLevel(settings.diagnostics().logLevel());
+ log::debug("using ini at '{}'", settings.filename());
+
// global crashDumpType sits in OrganizerCore to make a bit less ugly to
// update it when the settings are changed during runtime
OrganizerCore::setGlobalCrashDumpsType(settings.diagnostics().crashDumpsType());
@@ -860,6 +866,8 @@ int main(int argc, char *argv[])
} // we continue for the primary instance OR if MO was called with parameters
do {
+ LogModel::instance().clear();
+
// make sure the log file isn't locked in case MO was restarted and
// the previous instance gets deleted
log::getDefault().setFile({});