guard next_action_type() call

calref · Aug 8, 2024 · a1022aa · a1022aa
1 parent f549317
commit a1022aa
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/dialogxml/dialogs/dialog.cpp b/src/dialogxml/dialogs/dialog.cpp
@@ -536,14 +536,12 @@ void cDialog::handle_events() {
 	cFramerateLimiter fps_limiter;
 
 	while(dialogNotToast) {
-		if(replaying){
-			if(next_action_type() == "control_click"){
-				Element& next_action = pop_next_action();
-				auto info = info_from_action(next_action);
-				if(info["id"].empty()) continue;
-				eKeyMod mods = static_cast<eKeyMod>(atoi(info["mods"].c_str()));
-				controls[info["id"]]->triggerClickHandler(*this, info["id"], mods);
-			}
+		if(replaying && has_next_action() && next_action_type() == "control_click"){
+			Element& next_action = pop_next_action();
+			auto info = info_from_action(next_action);
+			if(info["id"].empty()) continue;
+			eKeyMod mods = static_cast<eKeyMod>(atoi(info["mods"].c_str()));
+			controls[info["id"]]->triggerClickHandler(*this, info["id"], mods);
 		}else{
 			while(win.pollEvent(currentEvent)) handle_one_event(currentEvent);
 		}