Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2011-05-29 21:30:46 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:18:22 +0300
commitd226b5726dc8890d9bac71d0e7ddb93359d95184 (patch)
tree14f16538f6e2a9641147d2fa37e278ad94687491 /qt/main.cpp
parent5db477d1f2577838cf1ace96f0ba87ce8ebcc8cd (diff)
Fix assertions in Release.
Do not catch all exception in main.
Diffstat (limited to 'qt/main.cpp')
-rw-r--r--qt/main.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/qt/main.cpp b/qt/main.cpp
index 58bbf0c7dc..37486bb498 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -98,21 +98,15 @@ int main(int argc, char *argv[])
eulaAccepted = (eulaDialog.exec() == 1);
Settings::Set(SETTING_EULA_ACCEPTED, eulaAccepted);
}
+
int returnCode = -1;
- if (eulaAccepted)
+ if (eulaAccepted) // User has accepted EULA
{
- // User has accepted EULA
qt::MainWindow w;
-
w.show();
-
- try {
returnCode = a.exec();
- } catch (std::exception const & e)
- {
- LOG(LERROR, (e.what()));
- }
}
+
// QTBUG: Fix memory leaks. Nobody delete created plugins.
//#ifdef OMIM_OS_WINDOWS
// QFactoryLoader * arr[] = { imageLoader(), bearerLoader() };
@@ -126,6 +120,5 @@ int main(int argc, char *argv[])
//#endif
LOG(LINFO, ("MapsWithMe finished with code : ", returnCode));
-
return returnCode;
}