From 8348f883bf617cf4ed866257cdf49d3ec6866202 Mon Sep 17 00:00:00 2001 From: riccardom Date: Sun, 5 Jun 2011 16:43:18 +0000 Subject: [PATCH] gtk: call launch after rom reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jan reports that if you call reset when a game is paused the statusbar would wrongly report the game as playing when it is actually paused. Jan's attached patch removes the call to desmume_resume() and the status bar update. I think the intent here is different and the plan was to reload the game so just call Launch directly as already Jan noticed it would do the right thing. Based on a patch from Jan Bücken (nooris), #3288654 --- desmume/src/gtk/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index fcebcb19c..d88f6ef71 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -1048,9 +1048,7 @@ static void OpenRecent(GtkRecentChooser *chooser, gpointer user_data) static void Reset() { NDS_Reset(); - desmume_resume(); - - UpdateStatusBar("Running ..."); + Launch(); }