diff options
| author | Tannin <sherb@gmx.net> | 2016-05-27 14:04:00 +0200 |
|---|---|---|
| committer | Tannin <sherb@gmx.net> | 2016-05-27 14:04:00 +0200 |
| commit | bfbb19099839019c785dc81c83b07dadbd394168 (patch) | |
| tree | e84d45b9e7d58c2f3ab649b919ac93fb5207131e /src/main.cpp | |
| parent | c3b7737ae46ad4770532e3380c9ceb6ed4d14cf7 (diff) | |
moved button to switch instance (and to portable mode) to the main window
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6940e288..e289453c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -630,13 +630,12 @@ int main(int argc, char *argv[]) QString dataPath;
try {
- dataPath = InstanceManager().determineDataPath();
+ dataPath = InstanceManager::instance().determineDataPath();
} catch (const std::exception &e) {
QMessageBox::critical(nullptr, QObject::tr("Failed to set up instance"),
e.what());
return 1;
}
-
application.setProperty("dataPath", dataPath);
LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");
@@ -647,7 +646,6 @@ int main(int argc, char *argv[]) }
int result = runApplication(application, instance, splash);
-
if (result != INT_MAX) {
return result;
}
|
