From de1d07090a4261b4ee5d078bb7c28613f711da3f Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 20 Aug 2014 20:57:51 +0100 Subject: [PATCH] Returning correct app failure codes if the app quits before finishing initialisation. --- modules/juce_events/messages/juce_ApplicationBase.cpp | 2 +- modules/juce_gui_basics/native/juce_android_Windowing.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_events/messages/juce_ApplicationBase.cpp b/modules/juce_events/messages/juce_ApplicationBase.cpp index 7a87fdbc64..dafc27e66b 100644 --- a/modules/juce_events/messages/juce_ApplicationBase.cpp +++ b/modules/juce_events/messages/juce_ApplicationBase.cpp @@ -232,7 +232,7 @@ int JUCEApplicationBase::main() jassert (app != nullptr); if (! app->initialiseApp()) - return 0; + return app->getApplicationReturnValue(); JUCE_TRY { diff --git a/modules/juce_gui_basics/native/juce_android_Windowing.cpp b/modules/juce_gui_basics/native/juce_android_Windowing.cpp index b2d1ee7772..200615f232 100644 --- a/modules/juce_gui_basics/native/juce_android_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_android_Windowing.cpp @@ -43,7 +43,7 @@ JUCE_JNI_CALLBACK (JUCE_ANDROID_ACTIVITY_CLASSNAME, launchApp, void, (JNIEnv* en JUCEApplicationBase* app = JUCEApplicationBase::createInstance(); if (! app->initialiseApp()) - exit (0); + exit (app->getApplicationReturnValue()); jassert (MessageManager::getInstance()->isThisTheMessageThread()); }