[mupen64plus] 151/262: Resume when pressing on start when in pause mode

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit f2a5e68c2005cbebcfeb85686d66a09acf2160ac
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Oct 5 15:46:32 2009 +0200

    Resume when pressing on start when in pause mode
    
    When the program is paused and user presses start it will try to restart
    the program without actual resetting it correctly. As result it will
    just not behave as expected. When it is paused it should continue
    instead.
---
 debian/changelog                     |  2 ++
 debian/patches/resume_on_start.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba6cb7e..6117de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mupen64plus (1.5+dfsg1-6) UNRELEASED; urgency=low
       slowdowns after savestate load
     - Add load_vistatus.patch, Set video width and status during savestate load
     - Add fix_r0_override.patch, Don't allow to override r0 register
+    - Add resume_on_start.patch, Resume when pressing on start when in pause
+      mode to prevent corruption
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sat, 03 Oct 2009 00:36:41 +0200
 
diff --git a/debian/patches/resume_on_start.patch b/debian/patches/resume_on_start.patch
new file mode 100644
index 0000000..0da4495
--- /dev/null
+++ b/debian/patches/resume_on_start.patch
@@ -0,0 +1,24 @@
+Description: Resume when pressing on start when in pause mode
+ When the program is paused and user presses start it will try to restart the
+ program without actual resetting it correctly. As result it will just not
+ behave as expected. When it is paused it should continue instead.
+Bug: http://code.google.com/p/mupen64plus/issues/detail?id=282
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/main/gui_gtk/main_gtk.c b/main/gui_gtk/main_gtk.c
+index 41d382ebd2650dd48f5b93bf788ee32fca26e807..66f6777069564031e560b9194123038194f36f9a 100644
+--- a/main/gui_gtk/main_gtk.c
++++ b/main/gui_gtk/main_gtk.c
+@@ -499,7 +499,10 @@ static void callback_start_emulation(GtkWidget* widget, gpointer data)
+         }
+ 
+     gdk_threads_leave();
+-    startEmulation();
++    if(g_EmulatorRunning)
++        pauseContinueEmulation();
++    else
++        startEmulation();
+ }
+ 
+ static void callback_pause_emulation(GtkWidget* widget, gpointer data)
diff --git a/debian/patches/series b/debian/patches/series
index ec7dc0f..667a49f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ correct_fpr32_mapping.patch
 load_aidacrate.patch
 load_vistatus.patch
 fix_r0_override.patch
+resume_on_start.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git