And then there was 2.1.2. :-P

diff --git a/Makefile b/Makefile
index eabcac91e04c0cff42ea9454224e4bba6e6bf05e..1eb5e431b2016b714adf0e9260f5cf5fa7f5d744 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,11 @@ obj:
 
 prepare: obj
        @echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
-#      @echo "#define VJ_RELEASE_VERSION \"v2.1.2\"" > src/version.h
-#      @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
-       @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
-       @echo "#define VJ_RELEASE_SUBVERSION \"2.1.2 Prerelease\"" >> src/version.h
+       @echo "#define VJ_RELEASE_VERSION \"v2.1.2\"" > src/version.h
+       @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+       @echo "#define VJ_REMOVE_DEV_CODE" >> src/version.h
+#      @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
+#      @echo "#define VJ_RELEASE_SUBVERSION \"2.1.2 Prerelease\"" >> src/version.h
 
 virtualjaguar: sources libs makefile-qt
        @echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"

diff --git a/docs/WHATSNEW b/docs/WHATSNEW
index 45a48ffb3a39ff58a75f6480554adde76551178e..cfbbafd5828a4e80368074eb3f62ca7835f94eaa 100644 (file)
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,7 +1,8 @@
 Virtual Jaguar v2.1.2 GCC/Qt
 ----------------------------
 
-* Nothing yet ;-)
+* Bugfix for catastrophic failure in Controller config dialog. Thanks to ggn for
+  reporting this! [Shamus]
 
 
 Virtual Jaguar v2.1.1 GCC/Qt

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 0901b0f6e1c04ac3b09ba7f0c466ac4f7799543c..1b3df54f035bb6575b9dfc52f101d19ba0863f06 100644 (file)
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -37,7 +37,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
                VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ")"
                "</td></tr>"
                "<tr><td align='right'><b>Coders: </b></td><td>James Hammons (shamus)<br>Niels Wagenaar (nwagenaar)<br>Carwin Jones (Caz)<br>Adam Green</td></tr>"
-               "<tr><td align='right'><b>Testers: </b></td><td>Cyrano Jones, LinkoVitch, partycle, neo-rg,<br>Robert R, TheUMan, Dissection, overridex,<br>geormetal</td></tr>"
+               "<tr><td align='right'><b>Testers: </b></td><td>Cyrano Jones, LinkoVitch, partycle, ggn,<br>neo-rg, Robert R, TheUMan, Dissection,<br>overridex, geormetal</td></tr>"
                "<tr><td align='right'><b>Build Team: </b></td><td>shamus (win32)<br>goldenegg (MacOS)</td></tr>"
                "<tr><td align='right'><b>Homepage: </b></td><td>http://icculus.org/virtualjaguar/</td></tr>"
                "</table>"

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index cc5dab1880c251e9001a5f55f60f717d89970007..e8ebb63eb7059618a396ebb1ea49c184ddbd52c8 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -454,13 +454,14 @@ void MainWin::closeEvent(QCloseEvent * event)
 
 void MainWin::keyPressEvent(QKeyEvent * e)
 {
+#ifndef VJ_REMOVE_DEV_CODE
        // From jaguar.cpp
        extern bool startM68KTracing;
        // From joystick.cpp
        extern int blit_start_log;
        // From blitter.cpp
        extern bool startConciseBlitLogging;
-
+#endif
 
        // We ignore the Alt key for now, since it causes problems with the GUI
        if (e->key() == Qt::Key_Alt)
@@ -468,6 +469,8 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+// Bar this shite from release versions kthxbai
+#ifndef VJ_REMOVE_DEV_CODE
        else if (e->key() == Qt::Key_F11)
        {
                startM68KTracing = true;
@@ -486,6 +489,7 @@ void MainWin::keyPressEvent(QKeyEvent * e)
                e->accept();
                return;
        }
+#endif
        else if (e->key() == Qt::Key_F8)
        {
                // ggn: For extra NYAN pleasure...