From bfbb19099839019c785dc81c83b07dadbd394168 Mon Sep 17 00:00:00 2001 From: Tannin Date: Fri, 27 May 2016 14:04:00 +0200 Subject: moved button to switch instance (and to portable mode) to the main window --- src/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/main.cpp') 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; } -- cgit v1.3.1