From 1fde815769d3c1c7d3fcabe993e6b02ba3b86082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Thu, 9 Jul 2020 17:29:37 +0200
Subject: [PATCH] [ion/android] Do not setWindowStyle if SDL not initialized

When a library was broken, we would see an error due to the failed
setWindowStyle call, instead of getting the briken library error.
---
 .../src/java/com/numworks/calculator/EpsilonActivity.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java b/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
index 6a1c4f159..ef056c93e 100644
--- a/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
+++ b/ion/src/simulator/android/src/java/com/numworks/calculator/EpsilonActivity.java
@@ -74,7 +74,11 @@ public class EpsilonActivity extends SDLActivity {
      * setWindowStyle(false) was already called in SDLActivity::onCreate. Find
      * out why and make a proper fix? */
     super.onCreate(savedInstanceState);
-    setWindowStyle(true);
+    if (!mBrokenLibraries) {
+      /* If mBrokenLibraries, SDL is not initialized by onCreate in
+       * SDLActivity.java. */
+      setWindowStyle(true);
+    }
   }
 
 }