livecode · runrevmark · Aug 22, 2017 · Aug 17, 2017 · Aug 17, 2017
diff --git a/docs/notes/bugfix-19420.md b/docs/notes/bugfix-19420.md
@@ -0,0 +1 @@
+# Fix crash on startup when resuming android app after quit
diff --git a/engine/src/dskmain.cpp b/engine/src/dskmain.cpp
@@ -39,6 +39,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "font.h"
 #include "stacksecurity.h"
 #include "system.h"
+#include "eventqueue.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -114,6 +115,9 @@ bool X_init(int argc, MCStringRef argv[], MCStringRef envp[])
 	// MW-2012-02-23: [[ FontRefs ]] Initialize the logical font table module.
 	MCLogicalFontTableInitialize();
 
+	// Initialize the event queue
+	MCEventQueueInitialize();
+
 	////
 
 	MCswapbytes = byte_swapped();

diff --git a/engine/src/em-dc-mainloop.cpp b/engine/src/em-dc-mainloop.cpp
@@ -30,6 +30,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "system.h"
 #include "font.h"
 #include "util.h"
+#include "eventqueue.h"
 
 #include <arpa/inet.h>
 
@@ -143,6 +144,12 @@ X_init(int argc,
 		goto error_cleanup;
 	}
 
+	// Initialize the event queue
+	if (!MCEventQueueInitialize())
+	{
+		goto error_cleanup;
+	}
+
 	/* ---------- More globals */
 
 	/* executable file name */

diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -1471,6 +1471,9 @@ int X_close(void)
 	// Cleanup the parentscript stuff
 	MCParentScript::Cleanup();
 
+	// Finalize the event queue
+	MCEventQueueFinalize();
+
 	// MW-2012-02-23: [[ LogFonts ]] Finalize the font table module.
 	MCLogicalFontTableFinalize();
 	// MW-2012-02-23: [[ FontRefs ]] Finalize the font module.

diff --git a/engine/src/mblmain.cpp b/engine/src/mblmain.cpp
@@ -37,6 +37,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "redraw.h"
 #include "system.h"
 #include "font.h"
+#include "eventqueue.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -105,6 +106,9 @@ bool X_init(int argc, MCStringRef argv[], int envc, MCStringRef envp[])
 	// MW-2012-02-23: [[ FontRefs ]] Initialize the logical font table module.
 	MCLogicalFontTableInitialize();
 
+	// Initialize the event queue
+	MCEventQueueInitialize();
+
     // MM-2014-02-10: [[ LipOpenSSL 1.0.1e ]] Attempt load revsecurity library on Java side.
 #if defined(TARGET_SUBPLATFORM_ANDROID)
 	extern bool revandroid_loadExternalLibrary(MCStringRef p_external, MCStringRef& r_filename);

diff --git a/engine/src/srvmain.cpp b/engine/src/srvmain.cpp
@@ -40,6 +40,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "uidc.h"
 #include "font.h"
 #include "libscript/script.h"
+#include "eventqueue.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -377,6 +378,9 @@ bool X_init(int argc, MCStringRef argv[], MCStringRef envp[])
 	// MW-2012-02-23: [[ FontRefs ]] Initialize the logical font table module.
 	MCLogicalFontTableInitialize();
 
+	// Initialize the event queue
+	MCEventQueueInitialize();
+
 	////
 
     // Create the basic locale and the system locale
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Fix crash on startup when resuming android app after quit