Fixed animation bug

OctoFlareDev · OctoFlareDev · commit 439525c5b55a · 2021-05-27T17:53:52.000+08:00
diff --git a/scripts/draw_switch/draw_switch.gml b/scripts/draw_switch/draw_switch.gml
@@ -11,7 +11,7 @@ function draw_switch() {
 	    lock = argument[5]
 	if (tip != "") popup_set_window(xx, yy, 13 + string_width(str) + 8, 13, tip)
 	if (lock = 1) {
-	    draw_sprite(spr_switch, 6, xx, yy)
+	    if (!expression) draw_sprite(spr_switch, 6, xx, yy)
 		if (expression) draw_sprite(spr_switch, 7, xx, yy)
 	    draw_set_color(make_color_rgb(204, 204, 204))
 	    if (theme) {
@@ -25,7 +25,7 @@ function draw_switch() {
 	    m = mouse_rectangle(xx, yy, 26 + string_width(str) + 8, 13)
 	    if (w_isdragging > 0) m = 0
 	    if (m) m += mouse_check_button(mb_left)
-	    draw_sprite(spr_switch, m, xx, yy)
+	    if (!expression) draw_sprite(spr_switch, m, xx, yy)
 	    if (expression) draw_sprite(spr_switch, m + 3, xx, yy)
 	    draw_text(xx + 31, yy - 1, str)
 	    return (m && mouse_check_button_released(mb_left))
diff --git a/scripts/draw_window_about/draw_window_about.gml b/scripts/draw_window_about/draw_window_about.gml
@@ -21,7 +21,7 @@ function draw_window_about() {
 		draw_text(x1 + 150, y1 + 217, "Version " + version + " - Released " + version_date + "\n\nThis program is a continuation of\n Minecraft Note Block Studio, \ncreated by David Norgren. \n\nThis product is not affiliated with\nMojang Studios, Microsoft Studios\nor the game Minecraft.")
 	}
 	draw_set_halign(fa_left)
-	if (draw_button2(x1 + 120, y1 + 370, 72, "OK", false)) windowclose = 1
+	if (draw_button2(x1 + 120, y1 + 370, 72, "OK", false) && windowopen = 1) windowclose = 1
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
 		if (windowalpha < 1) {
diff --git a/scripts/draw_window_branch_export/draw_window_branch_export.gml b/scripts/draw_window_branch_export/draw_window_branch_export.gml
@@ -211,7 +211,7 @@ function draw_window_branch_export() {
 	        branch_export()
 	    }
 	}
-	if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0) {
+	if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {
 		windowclose = 1
 		selected_tab_sch = 0
 	}
diff --git a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml
@@ -23,7 +23,7 @@ function draw_window_clip_editor() {
 	text_exists[59] = 0
 	selection_copied = draw_text_edit(59, selection_copied, x1 + 32, y1 + 23 * 3, 370, 300, 0, 0) 
 
-	if (draw_button2(x1 + 320, y1 + 398, 72, "OK")) {
+	if (draw_button2(x1 + 320, y1 + 398, 72, "OK") && windowopen = 1) {
 		windowclose = 1
 	}
 	window_set_cursor(curs)
diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml
@@ -228,7 +228,7 @@ function draw_window_datapack_export() {
 	}
 
 	//Cancel button
-	if (draw_button2(x1 + 390, y1 + 398, 72, "Cancel", false)) {
+	if (draw_button2(x1 + 390, y1 + 398, 72, "Cancel", false) && windowopen = 1) {
 		windowclose = 1
 	}
 	window_set_cursor(cr_default)
diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml
@@ -74,7 +74,7 @@ function draw_window_greeting() {
 	draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))
 	}
 	draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Create a new song")
-	if (a = 2 && mouse_check_button_released(mb_left)) windowclose = 1
+	if (a = 2 && mouse_check_button_released(mb_left) && windowopen = 1) windowclose = 1
 
 	c += 44
 	b = x1 + 300
diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml
@@ -76,7 +76,7 @@ function draw_window_instruments() {
 		instrument_swap(userselect, instrument_list[| insselect])
 		c = 1
 	}
-	if (draw_button2(x1 + 456, y1 + 318, 80, "OK") && wmenu = 0) {
+	if (draw_button2(x1 + 456, y1 + 318, 80, "OK") && wmenu = 0 && windowopen = 1) {
 		windowclose = 1
 		if (save_version < 5 && user_instruments > 18) {
 			show_message("This song contains more than 18 instruments and cannot be saved in version " + string(save_version) + ". The save version will be changed to " + string(nbs_version) + ".")
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -62,7 +62,7 @@ function draw_window_macro_arpeggio() {
 		selection_load(selection_x,selection_y,str,true)
 		selection_code_update()
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -55,7 +55,7 @@ function draw_window_macro_portamento() {
 		selection_load(selection_x,selection_y,str,true)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml b/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml
@@ -46,7 +46,7 @@ function draw_window_macro_setpanning() {
 		selection_load(selection_x,selection_y,str,true)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml b/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml
@@ -45,7 +45,7 @@ function draw_window_macro_setpitch() {
 		selection_load(selection_x,selection_y,str,true)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -45,7 +45,7 @@ function draw_window_macro_setvelocity() {
 		selection_load(selection_x,selection_y,str,true)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -85,7 +85,7 @@ function draw_window_macro_stagger() {
 		selection_code_update()
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	}
-	if (draw_button2(x1 + 75, y1 + 128, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 75, y1 + 128, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -64,7 +64,7 @@ function draw_window_macro_stereo() {
 		selection_load(selection_x,selection_y,str,true)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
-	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml b/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml
@@ -58,7 +58,7 @@ function draw_window_macro_tremolo() {
 		if tremolotype = 2 macro_tremolo_fadeout()
 		window = 0
 	}
-	if (draw_button2(x1 + 80, y1 + 215, 60, "Cancel")) {windowclose = 1}
+	if (draw_button2(x1 + 80, y1 + 215, 60, "Cancel") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_midi_import/draw_window_midi_import.gml b/scripts/draw_window_midi_import/draw_window_midi_import.gml
@@ -35,7 +35,7 @@ function draw_window_midi_import() {
 	if (draw_switch(x1 + 12, y1 + 374, w_midi_remember, "Remember changes", "Whether to use these settings the\nnext time you import a MIDI file.") && wmenu = 0) w_midi_remember=!w_midi_remember
 	}
 	if (draw_button2(x1 + 520, y1 + 368, 72, "Import") && wmenu = 0) {w_midi_tab = 0 window = -1 import_midi()}
-	if (draw_button2(x1 + 520 - 80, y1 + 368, 72, "Cancel") && wmenu = 0) {midifile = "" w_midi_tab = 0 windowclose = 1}
+	if (draw_button2(x1 + 520 - 80, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {midifile = "" w_midi_tab = 0 windowclose = 1}
 	if (draw_button2(x1 + 520 - 160, y1 + 368, 72, "Use default") && wmenu = 0) {
 	    if (question("Are you sure?", "Confirm")) { 
 	        midi_instruments()
diff --git a/scripts/draw_window_mididevices/draw_window_mididevices.gml b/scripts/draw_window_mididevices/draw_window_mididevices.gml
@@ -32,7 +32,7 @@ function draw_window_mididevices() {
 	popup_set_window(x1 + 13 - 2, y1 + 67, 250 + 75, 20, "The name of the device.")
 	draw_text(x1 + 18, y1 + 70, "Name")
 
-	if (draw_button2(x1 + 408, y1 + 318, 80, "OK") && wmenu = 0) windowclose = 1
+	if (draw_button2(x1 + 408, y1 + 318, 80, "OK") && wmenu = 0 && windowopen = 1) windowclose = 1
 
 	// Instruments
 	for (a = 0; a < 11; a += 1) {
diff --git a/scripts/draw_window_minecraft/draw_window_minecraft.gml b/scripts/draw_window_minecraft/draw_window_minecraft.gml
@@ -312,7 +312,7 @@ function draw_window_minecraft() {
 		draw_theme_color()
 	}
 	
-	if (draw_button2(x1 + 240 - 36, y1 + 413, 72, "OK")) windowclose = 1
+	if (draw_button2(x1 + 240 - 36, y1 + 413, 72, "OK") && windowopen = 1) windowclose = 1
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
 		if (windowalpha < 1) {
diff --git a/scripts/draw_window_mp3_export/draw_window_mp3_export.gml b/scripts/draw_window_mp3_export/draw_window_mp3_export.gml
@@ -28,7 +28,7 @@ function draw_window_mp3_export() {
 	//Submit button
 	if (draw_button2(x1 + 165, y1 + 238, 72, "Export", false)) mp3_export()
 
-	if (draw_button2(x1 + 10, y1 + 238, 72, "Cancel", false)) {
+	if (draw_button2(x1 + 10, y1 + 238, 72, "Cancel", false) && windowopen = 1) {
 		windowclose = 1
 	}
 	window_set_cursor(cr_default)
diff --git a/scripts/draw_window_preferences_f/draw_window_preferences_f.gml b/scripts/draw_window_preferences_f/draw_window_preferences_f.gml
@@ -21,7 +21,7 @@ function draw_window_preferences_f() {
 		draw_set_color(13487565)
 		if (mouse_check_button(mb_left)) draw_set_color(12105912)
 		draw_rectangle(x1 + 1, y1 + 30, x1 + 39, y1 + 69, 0)
-		if (mouse_check_button_released(mb_left)) {
+		if (mouse_check_button_released(mb_left && windowopen = 1)) {
 			windowclose = 1
 		}
 	}
diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml
@@ -80,7 +80,7 @@ function draw_window_properties() {
 	timestoloop = loopmax
 	draw_theme_color()
 
-	if (draw_button2(x1 + 430 - 72, y1 + 366, 72, "OK")) {windowclose = 1}
+	if (draw_button2(x1 + 430 - 72, y1 + 366, 72, "OK") && windowopen = 1) {windowclose = 1}
 	window_set_cursor(curs)
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
diff --git a/scripts/draw_window_save_options/draw_window_save_options.gml b/scripts/draw_window_save_options/draw_window_save_options.gml
@@ -33,7 +33,7 @@ function draw_window_save_options() {
 	if (draw_radiobox(x1 + 15, y1 + 95, save_version = 1, "v1", "Includes custom instrument index", min_version > 1)) save_version = 1
 	if (draw_radiobox(x1 + 15, y1 + 110, save_version = 0, "Classic", "Doesn't have any of the above, but works on all versions.", min_version > 0)) save_version = 0
 
-	if (draw_button2(x1 + 40, y1 + 135, 60, "OK")) {
+	if (draw_button2(x1 + 40, y1 + 135, 60, "OK") && windowopen = 1) {
 		if save_version != nbs_version question("Some of the song's data will be lost if you save in a previous version! Are you sure?", "Confirm")
 		changed = 1
 		windowclose = 1
diff --git a/scripts/draw_window_schematic_export/draw_window_schematic_export.gml b/scripts/draw_window_schematic_export/draw_window_schematic_export.gml
@@ -229,7 +229,7 @@ function draw_window_schematic_export() {
 	        schematic_export()
 	    }
 	}
-	if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0) {
+	if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {
 		windowclose = 1
 	}
 	if (draw_button2(x1 + 470 - 80 * 2, y1 + 368, 72, "Use default") && wmenu = 0) {
diff --git a/scripts/draw_window_set_tempo/draw_window_set_tempo.gml b/scripts/draw_window_set_tempo/draw_window_set_tempo.gml
@@ -25,7 +25,7 @@ function draw_window_set_tempo() {
 	tempoo = draw_textarea(57, x1 + 15, y1 + 50, 113, 25, string(tempoo), "Will always floor to integer if using BPM.") 
 
 	draw_theme_color()
-	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+	if (draw_button2(x1 + 10, y1 + 98, 60, "OK") && windowopen = 1) {
 		try {
 			if (use_bpm) tempo = floor(tempoo) / 15
 			else tempo = floor(real(tempoo) * 100) / 100
diff --git a/scripts/draw_window_songinfo/draw_window_songinfo.gml b/scripts/draw_window_songinfo/draw_window_songinfo.gml
@@ -125,7 +125,7 @@ function draw_window_songinfo() {
 
 	if (window = w_songinfoedit) {
 	    if (draw_button2(x1 + floor(w / 2) - 70, y1 + h - 30, 70, "Edit")) window = w_properties
-	    if (draw_button2(x1 + floor(w / 2) + 5, y1 + h - 30, 70, "OK")) windowclose = 1
+	    if (draw_button2(x1 + floor(w / 2) + 5, y1 + h - 30, 70, "OK") && windowopen = 1) windowclose = 1
 	} else {
 	    if (mouse_check_button_pressed(mb_left)) window = w_releasemouse
 	}
diff --git a/scripts/draw_window_stats/draw_window_stats.gml b/scripts/draw_window_stats/draw_window_stats.gml
@@ -47,7 +47,7 @@ function draw_window_stats() {
 	        changed = 1
 	    }
 	}
-	if (draw_button2(x1 + 220, y1 + 368, 72, "OK")) windowclose = 1
+	if (draw_button2(x1 + 220, y1 + 368, 72, "OK") && windowopen = 1) windowclose = 1
 	window_set_cursor(cr_default)
 	if (windowopen = 0 && theme = 3) {
 		if (windowalpha < 1) {
diff --git a/scripts/draw_window_update/draw_window_update.gml b/scripts/draw_window_update/draw_window_update.gml
@@ -47,7 +47,7 @@ function draw_window_update() {
 	draw_set_font(fnt_main)
 		if (theme = 3) draw_set_font(fnt_wslui)
 	draw_scrollbar(update_scrollbar, x1 + 470, y1 + 60, 12, 18, n, 0, 1)
-	if (draw_button2(x1 + 220, y1 + 340, 72, "OK")) {
+	if (draw_button2(x1 + 220, y1 + 340, 72, "OK") && windowopen = 1) {
 	    if (window = w_update) {
 	        window = w_greeting
 			save_settings() // Save new version number

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function draw_window_about() {`
`21`	`21`	`draw_text(x1 + 150, y1 + 217, "Version " + version + " - Released " + version_date + "\n\nThis program is a continuation of\n Minecraft Note Block Studio, \ncreated by David Norgren. \n\nThis product is not affiliated with\nMojang Studios, Microsoft Studios\nor the game Minecraft.")`
`22`	`22`	`}`
`23`	`23`	`draw_set_halign(fa_left)`
`24`		`- if (draw_button2(x1 + 120, y1 + 370, 72, "OK", false)) windowclose = 1`
	`24`	`+ if (draw_button2(x1 + 120, y1 + 370, 72, "OK", false) && windowopen = 1) windowclose = 1`
`25`	`25`	`window_set_cursor(cr_default)`
`26`	`26`	`if (windowopen = 0 && theme = 3) {`
`27`	`27`	`if (windowalpha < 1) {`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ function draw_window_branch_export() {`
`211`	`211`	`branch_export()`
`212`	`212`	`}`
`213`	`213`	`}`
`214`		`- if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0) {`
	`214`	`+ if (draw_button2(x1 + 470 - 80 * 1, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {`
`215`	`215`	`windowclose = 1`
`216`	`216`	`selected_tab_sch = 0`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function draw_window_clip_editor() {`
`23`	`23`	`text_exists[59] = 0`
`24`	`24`	`selection_copied = draw_text_edit(59, selection_copied, x1 + 32, y1 + 23 * 3, 370, 300, 0, 0)`
`25`	`25`
`26`		`- if (draw_button2(x1 + 320, y1 + 398, 72, "OK")) {`
	`26`	`+ if (draw_button2(x1 + 320, y1 + 398, 72, "OK") && windowopen = 1) {`
`27`	`27`	`windowclose = 1`
`28`	`28`	`}`
`29`	`29`	`window_set_cursor(curs)`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ function draw_window_datapack_export() {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`//Cancel button`
`231`		`- if (draw_button2(x1 + 390, y1 + 398, 72, "Cancel", false)) {`
	`231`	`+ if (draw_button2(x1 + 390, y1 + 398, 72, "Cancel", false) && windowopen = 1) {`
`232`	`232`	`windowclose = 1`
`233`	`233`	`}`
`234`	`234`	`window_set_cursor(cr_default)`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function draw_window_greeting() {`
`74`	`74`	`draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))`
`75`	`75`	`}`
`76`	`76`	`draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Create a new song")`
`77`		`- if (a = 2 && mouse_check_button_released(mb_left)) windowclose = 1`
	`77`	`+ if (a = 2 && mouse_check_button_released(mb_left) && windowopen = 1) windowclose = 1`
`78`	`78`
`79`	`79`	`c += 44`
`80`	`80`	`b = x1 + 300`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function draw_window_instruments() {`
`76`	`76`	`instrument_swap(userselect, instrument_list[\| insselect])`
`77`	`77`	`c = 1`
`78`	`78`	`}`
`79`		`- if (draw_button2(x1 + 456, y1 + 318, 80, "OK") && wmenu = 0) {`
	`79`	`+ if (draw_button2(x1 + 456, y1 + 318, 80, "OK") && wmenu = 0 && windowopen = 1) {`
`80`	`80`	`windowclose = 1`
`81`	`81`	`if (save_version < 5 && user_instruments > 18) {`
`82`	`82`	`show_message("This song contains more than 18 instruments and cannot be saved in version " + string(save_version) + ". The save version will be changed to " + string(nbs_version) + ".")`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function draw_window_macro_arpeggio() {`
`62`	`62`	`selection_load(selection_x,selection_y,str,true)`
`63`	`63`	`selection_code_update()`
`64`	`64`	`}`
`65`		`- if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}`
	`65`	`+ if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}`
`66`	`66`	`window_set_cursor(curs)`
`67`	`67`	`window_set_cursor(cr_default)`
`68`	`68`	`if (windowopen = 0 && theme = 3) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function draw_window_macro_portamento() {`
`55`	`55`	`selection_load(selection_x,selection_y,str,true)`
`56`	`56`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`57`	`57`	`}`
`58`		`- if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}`
	`58`	`+ if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}`
`59`	`59`	`window_set_cursor(curs)`
`60`	`60`	`window_set_cursor(cr_default)`
`61`	`61`	`if (windowopen = 0 && theme = 3) {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function draw_window_macro_setpanning() {`
`46`	`46`	`selection_load(selection_x,selection_y,str,true)`
`47`	`47`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`48`	`48`	`}`
`49`		`- if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel")) {windowclose = 1}`
	`49`	`+ if (draw_button2(x1 + 70, y1 + 98, 60, "Cancel") && windowopen = 1) {windowclose = 1}`
`50`	`50`	`window_set_cursor(curs)`
`51`	`51`	`window_set_cursor(cr_default)`
`52`	`52`	`if (windowopen = 0 && theme = 3) {`