aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVesa Halttunen <vesa.halttunen@nokia.com>2011-01-05 15:26:20 +0200
committerVesa Halttunen <vesa.halttunen@nokia.com>2011-01-05 16:07:20 +0200
commit43f4603128429184048c400e60ce15c33bd87349 (patch)
treec3fe9ead5c8b45e32cd7778cf22b7e615f56fe4f
parent521755a700f9f8358f364743bbfbbbb7128de859 (diff)
Fixes: NB#216289 - COREWEB: /usr/lib/meegotouch/applicationextensions/mapplicationextensionrunner 'QGraphicsScene::~QGraphicsScene MScene::~MScene MExtensionRunner::teardown MExtensionRunner::~MExtensionRunner MApplicationExtensionRunner::~MApplicationExtensionRunner'
Bug: NB#216289 - COREWEB: /usr/lib/meegotouch/applicationextensions/mapplicationextensionrunner 'QGraphicsScene::~QGraphicsScene MScene::~MScene MExtensionRunner::teardown MExtensionRunner::~MExtensionRunner MApplicationExtensionRunner::~MApplicationExtensionRunner' RevBy: TrustMe
-rw-r--r--debian/changelog1
-rw-r--r--mapplicationextensionrunner/main.cpp15
2 files changed, 10 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 014ff81a..2cf325a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libmeegotouch (0.20.72~1) unstable; urgency=low
* unreleased
+ * Fixes: NB#216289 - COREWEB: /usr/lib/meegotouch/applicationextensions/mapplicationextensionrunner 'QGraphicsScene::~QGraphicsScene MScene::~MScene MExtensionRunner::teardown MExtensionRunner::~MExtensionRunner MApplicationExtensionRunner::~MApplicationExtensionRunner'
-- Adrian Yanes <ext-adrian.yanes@nokia.com> Wed, 05 Jan 2011 14:40:52 +0100
diff --git a/mapplicationextensionrunner/main.cpp b/mapplicationextensionrunner/main.cpp
index a6e19b44..9b33415d 100644
--- a/mapplicationextensionrunner/main.cpp
+++ b/mapplicationextensionrunner/main.cpp
@@ -103,15 +103,18 @@ int main(int argc, char **argv)
if (getenv("M_OUTPUT_LEVEL") == NULL) {
setenv("M_OUTPUT_LEVEL", "warning", 0);
}
+
+ int returnValue = 0;
MApplication *app = new MApplication(argc, argv, metadata.resourceIdentifier(), new MyApplicationService());
- MApplicationExtensionRunner runner;
- if (!runner.init(argv[1], metadata)) {
+ MApplicationExtensionRunner *runner = new MApplicationExtensionRunner;
+ if (!runner->init(argv[1], metadata)) {
mWarning("MApplicationExtensionRunner") << "Application extension" << argv[2] << "initialization failed.";
- return ERROR_APPLICATION_EXTENSION_INIT_FAILED;
+ returnValue = ERROR_APPLICATION_EXTENSION_INIT_FAILED;
+ } else {
+ returnValue = app->exec();
}
-
- int returnValue = app->exec();
-
+ delete runner;
delete app;
+
return returnValue;
}