Switch: Fix rubberband crash, re-appeared in latest toolchain

rsn8887 · Sep 15, 2019 · 9f5f36d · 9f5f36d
1 parent afa6526
commit 9f5f36d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -513,7 +513,7 @@ if(BUILD_NX)
 -fif-conversion2 
 -finline-functions-called-once 
 -fipa-profile 
-#the commented three flags here cause the crash in rubberbands.cc 
+#the commented three flags here used to cause a crash in rubberbands.cc (see FIXME comment there) 
 #-fipa-pure-const 
 -fipa-reference 
 #-fmerge-constants 

diff --git a/src/others/Rubberband.cc b/src/others/Rubberband.cc
@@ -38,7 +38,10 @@ namespace enigma {
             anchor1 = dynamic_cast<Actor *>((Object *)val);
             ASSERT(anchor1 != NULL, XLevelRuntime, "Rubberband: 'anchor1' is no actor");
             ASSERT(anchor1 != anchor2.ac, XLevelRuntime, "Rubberband: 'anchor1' is identical to 'anchor2'");
+#ifndef __SWITCH__
+            // FIXME causes crash on Switch when loading any level with rubberbands
             switchAnchor(old, anchor1, anchor2Object());
+#endif
         } else if (key == "anchor2") {
             Object * old = anchor2Object();
             Object * obj = val;