From 5df78f4c2b824a192a4e2691870fd2f04de91075 Mon Sep 17 00:00:00 2001
From: "SND\\ckain_cp" <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 12 May 2014 07:21:29 +0000
Subject: gtk: enable controller configuration change during emulation
 pause/stop.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90350 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 gui/ConfDlg.c | 2 ++
 gui/GtkGui.c  | 8 --------
 gui/Plugin.c  | 2 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index 7041c259..c0d774ff 100755
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -326,6 +326,7 @@ void OnConf_Pad() {
 	PADconfigure conf;
 	char Plugin[MAXPATHLEN];
 
+	// PAD 1
 	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad1);
 	drv = SysLoadLibrary(Plugin);
 	if (drv == NULL) { printf("Error with file %s\n", Plugin); return; }
@@ -341,6 +342,7 @@ void OnConf_Pad() {
 
 	SysCloseLibrary(drv);
 
+	// PAD 2
 	if (strcmp(Config.Pad1, Config.Pad2) != 0) {
 		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
 		drv = SysLoadLibrary(Plugin);
diff --git a/gui/GtkGui.c b/gui/GtkGui.c
index b671d8d6..f783c669 100755
--- a/gui/GtkGui.c
+++ b/gui/GtkGui.c
@@ -129,8 +129,6 @@ void ResetMenuSlots() {
 		gtk_widget_set_sensitive(widget, TRUE);
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
-		gtk_widget_set_sensitive(widget, TRUE);
 #ifdef ENABLE_SIO1API
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
 		gtk_widget_set_sensitive(widget, TRUE);
@@ -149,8 +147,6 @@ void ResetMenuSlots() {
 		gtk_widget_set_sensitive(widget, TRUE);
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
-		gtk_widget_set_sensitive(widget, TRUE);
 		
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
 		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
@@ -179,8 +175,6 @@ void ResetMenuSlots() {
 		gtk_widget_set_sensitive(widget, FALSE);
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
-		gtk_widget_set_sensitive(widget, FALSE);
 #ifdef ENABLE_SIO1API
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
 		gtk_widget_set_sensitive(widget, FALSE);
@@ -197,8 +191,6 @@ void ResetMenuSlots() {
 		gtk_widget_set_sensitive(widget, FALSE);
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
-		gtk_widget_set_sensitive(widget, FALSE);
 
 		widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
 		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
diff --git a/gui/Plugin.c b/gui/Plugin.c
index 6727e9b1..08627455 100755
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -350,10 +350,12 @@ int _OpenPlugins() {
 	ret = GPU_open(&gpuDisp, "PCSXR", NULL);
 	if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
 	ret = PAD1_open(&gpuDisp);
+	ret |= PAD1_init(1); // Allow setting to change during run
 	if (ret < 0) { SysMessage(_("Error opening Controller 1 plugin!")); return -1; }
 	PAD1_registerVibration(GPU_visualVibration);
 	PAD1_registerCursor(GPU_cursor);
 	ret = PAD2_open(&gpuDisp);
+	ret |= PAD2_init(2); // Allow setting to change during run
 	if (ret < 0) { SysMessage(_("Error opening Controller 2 plugin!")); return -1; }
 	PAD2_registerVibration(GPU_visualVibration);
 	PAD2_registerCursor(GPU_cursor);
-- 
cgit v1.2.3