Fix crash in text tool

Grix · May 21, 2024 · da26ae0 · da26ae0
1 parent 8596fca
commit da26ae0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 16 deletions.
diff --git a/src/gms2/objects/controller/Create_0.gml b/src/gms2/objects/controller/Create_0.gml
@@ -1,5 +1,5 @@
-version = "2.0.0";
-versiondate = "2024-05-19";
+version = "2.0.1";
+versiondate = "2024-05-21";
 
 global.list_pool = ds_stack_create();
 global.list_pool_is_taken = ds_map_create();

diff --git a/src/gms2/options/mac/options_mac.yy b/src/gms2/options/mac/options_mac.yy
diff --git a/src/gms2/scripts/create_element/create_element.gml b/src/gms2/scripts/create_element/create_element.gml
@@ -8,13 +8,16 @@ function create_element() {
 	ML_ClearExceptions(parser_cb);
 	ML_ClearExceptions(parser_shape);
 
-	if (maxframes == 1) and (anienable)
+	if (maxframes == 1) and (anienable) // if you change this, also change same check in case ("text") in process_dialog_ilda
 	{
 	    //ds_list_add(controller.undo_list,"a"+string(controller.maxframes))
 		if (controller.use_bpm)
 			maxframes = round(controller.projectfps / (controller.bpm / 60 / controller.beats_per_bar)); // one bar
 		else
 			maxframes = controller.projectfps * 2; // two seconds
+
+
+
 	    scope_end = maxframes-1;
 	    refresh_minitimeline_flag = 1;
 

diff --git a/src/gms2/scripts/process_dialog_ilda/process_dialog_ilda.gml b/src/gms2/scripts/process_dialog_ilda/process_dialog_ilda.gml
@@ -797,8 +797,17 @@ function process_dialog_ilda() {
 	            case ("text"):
 	            {
 	                text = ds_map_find_value(argument[0], "result");
-
-	                for (i = 0;i <= maxframes;i++)
+
+					var t_maxframes = maxframes;
+					if (maxframes == 1) and (anienable)
+					{
+						if (controller.use_bpm)
+							t_maxframes = round(controller.projectfps / (controller.bpm / 60 / controller.beats_per_bar)); // one bar
+						else
+							t_maxframes = controller.projectfps * 2; // two seconds
+					}
+
+	                for (i = 0;i <= t_maxframes;i++)
 	                    xdelta[i] = 0;
 
 	                //start making elements

diff --git a/src/gms2/scripts/seq_paste_object/seq_paste_object.gml b/src/gms2/scripts/seq_paste_object/seq_paste_object.gml
@@ -7,9 +7,7 @@ function seq_paste_object() {
 
 	if (ds_list_size(copy_list) != 0)
 	{
-
 		add_action_history_ilda("SEQ_paste");
-
 
 	    ds_list_clear(somaster_list);
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/version_mac.txt b/version_mac.txt
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/versionnotes.txt b/versionnotes.txt
@@ -1,13 +1,12 @@
+v2.0.1
+- Fix possible crash when using the text tool.
+
 v2.0.0
 - Added BPM-based timing (turn on in settings window).
 - Fixed a significant crash that could happen sometime after copying and pasting in the timeline mode.
 - Fixed a crash when importing abnormal ILDA files.
 - Added speed adjustment control to grid mode.
 - Volume and speed adjustment can now be bound to MIDI knob in grid mode. 
 - Stop button / 0-key shortcut in grid mode now stops and resets all playing files, rather than pausing.
-- Various minor UI-related fixes and improvements.
-
-v1.11.2
-- Fix possible crash when activating output if blind zones have been defined.
-- Fix MIDI input does not take channels into account, causing duplicate keys for Akai pads etc.
-- Fix push-to-play option not working properly for MIDI input in grid mode.
+- Fix double-clicking items sometimes not working due to too short click interval needed.
+- Various minor UI-related fixes and improvements.
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,7 @@ function seq_paste_object() { @@
     	if (ds_list_size(copy_list) != 0)
     	{
     		add_action_history_ilda("SEQ_paste");
     	    ds_list_clear(somaster_list);
@@ Expand Down @@