X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;h=23b2008adbfa0ed8cd34d592f0707723efa21dfd;hb=0c9f3744f0129a95e60bb886073b65144ba31a22;hp=26134121f8577e68a7761f79665695cd966185dc;hpb=4333fdb4f2f297db8272d2ebc8323028df8c105f;p=virtualjaguar

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 2613412..23b2008 100644
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -48,6 +48,7 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
 	setWindowTitle(tr("Virtual Jaguar Settings"));
 
 	LoadDialogFromSettings();
+	controllerTab->UpdateLabel();				// Now it's safe to do this... ;-)
 }
 
 ConfigDialog::~ConfigDialog()
@@ -71,6 +72,9 @@ void ConfigDialog::LoadDialogFromSettings(void)
 		alpineTab->edit2->setText(vjs.absROMPath);
 		alpineTab->writeROM->setChecked(vjs.allowWritesToROM);
 	}
+
+	for(int i=0; i<21; i++)
+		controllerTab->p1Keys[i] = vjs.p1KeyBindings[i];
 }
 
 void ConfigDialog::UpdateVJSettings(void)
@@ -90,4 +94,7 @@ void ConfigDialog::UpdateVJSettings(void)
 		strcpy(vjs.absROMPath,    alpineTab->edit2->text().toAscii().data());
 		vjs.allowWritesToROM = alpineTab->writeROM->isChecked();
 	}
+
+	for(int i=0; i<21; i++)
+		vjs.p1KeyBindings[i] = controllerTab->p1Keys[i];
 }