Build ready 1.3.2 + Fixing outdated version crash

johnwdubois · Apr 11, 2023 · d660e4c · d660e4c
1 parent 9b16a37
commit d660e4c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/Rezonator/objects/obj_firestore/Other_70.gml b/Rezonator/objects/obj_firestore/Other_70.gml
@@ -33,7 +33,7 @@ if (async_load[? "type"] == "FirebaseFirestore_Document_Read") {
 				else {
 					// recommend downloading new version
 					show_debug_message("CHECK OUT MY NEW REZONATOR PLEASE");
-					scr_createDialogBox(DIALOG_VERSION_OUTOFDATE);
+					scr_createDialogBox(DIALOG_VERSION_OUTOFDATE, true);
 					with (obj_openingScreen) {
 						showDownloadDialogue = true;
 						alreadyShownDownloadDialogue = false;

diff --git a/Rezonator/objects/obj_openingScreen/Step_0.gml b/Rezonator/objects/obj_openingScreen/Step_0.gml
@@ -4,10 +4,9 @@ scr_multiDropDownMouseover();
 scr_ctrlHold();
 
 if (showDownloadDialogue && !alreadyShownDownloadDialogue) {
-	if (!instance_exists(obj_dialogueBox) && !instance_exists(obj_loadingBar)) {
+	if (!instance_exists(obj_loadingBar)) {
+		scr_createDialogBox(DIALOG_VERSION_OUTOFDATE, true);
 		alreadyShownDownloadDialogue = true;
-		instance_create_layer(x, y, "InstancesDialogue", obj_dialogueBox);
-		scr_setDialogType(DIALOG_VERSION_OUTOFDATE);
 	}
 }
 

diff --git a/Rezonator/options/mac/options_mac.yy b/Rezonator/options/mac/options_mac.yy
diff --git a/Rezonator/options/windows/options_windows.yy b/Rezonator/options/windows/options_windows.yy
diff --git a/Rezonator/scripts/scr_createDialogBox/scr_createDialogBox.gml b/Rezonator/scripts/scr_createDialogBox/scr_createDialogBox.gml
@@ -3,21 +3,23 @@ function scr_createDialogBox(type, _cancelOption = false, _noOption = false){
 	// create dialog box
 	if (!instance_exists(obj_dialogueBox)) {
 		instance_create_layer(x, y, "InstancesDialogue", obj_dialogueBox);
-	}
 
-	// want to change this eventually so we don't have to use alertWindowActive/questionWindowActive...
-	if (!_cancelOption && !_noOption) {
-		with (obj_dialogueBox) alertWindowActive = true;
-	}
-	else if (_cancelOption && !_noOption) {
-		with (obj_dialogueBox) questionWindowActive = true;
-	}
+		// want to change this eventually so we don't have to use alertWindowActive/questionWindowActive...
+		if (!_cancelOption && !_noOption) {
+			show_debug_message("scr_createDialogBox, alert");
+			with (obj_dialogueBox) alertWindowActive = true;
+		}
+		else if (_cancelOption && !_noOption) {
+			show_debug_message("scr_createDialogBox, question");
+			with (obj_dialogueBox) questionWindowActive = true;
+		}
 
-	// set type & options
-	with (obj_selectControl) {
-		dialogBoxType = type;
-		cancelOption = _cancelOption;
-		noOption = _noOption;
+		// set type & options
+		with (obj_selectControl) {
+			dialogBoxType = type;
+			cancelOption = _cancelOption;
+			noOption = _noOption;
+		}
 	}
 
 }