small fix for crash

Unreal-Dan · Jan 9, 2024 · 25e897a · 25e897a
1 parent a0cacd0
commit 25e897a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Launcher/Config.h b/Launcher/Config.h
@@ -6,7 +6,7 @@
 #include <string>
 
 // The current version of RBSE
-#define RBSE_VERSION            "3.8.2"
+#define RBSE_VERSION            "3.8.3"
 // maximum length of output file names
 #define MAX_OUTFILE_NAME_LEN    64
 // maximum length of output formats

diff --git a/Module/UIPlayer.cpp b/Module/UIPlayer.cpp
@@ -90,9 +90,18 @@ uint32_t djplayer_uiplayer::getDeckBPM()
         // change anytime new devices are added -- which seems not uncommon
         bpm_device_offset = find_device_offset("@BPM");
       }
+      if (!bpm_device_offset) {
+        break;
+      }
       bpmDevice = *(void **)((uintptr_t)this + bpm_device_offset);
+      if (!bpmDevice) {
+        break;
+      }
       // then the offsets for the bpm within the device should never change
       bpmDeviceInner = *(void **)((uintptr_t)bpmDevice + 0x80);
+      if (!bpmDeviceInner) {
+        break;
+      }
       bpm = *(uint32_t *)((uintptr_t)bpmDeviceInner + 0x154);
       break;
     }