# HG changeset patch
# User Chris Cannam
# Date 1287406041 -3600
# Node ID 3d1c69b2215e9310a306c4df70e82640e58356b0
# Parent  210a409e135a585631c2693609eace7a3f9c953c# Parent  84fd4bb8d6567a3f2cd0ca4964810e74a3c50a38
* Merge

diff -r 84fd4bb8d656 -r 3d1c69b2215e main/MainWindow.h
--- a/main/MainWindow.h	Mon Oct 18 13:44:25 2010 +0100
+++ b/main/MainWindow.h	Mon Oct 18 13:47:21 2010 +0100
@@ -69,8 +69,8 @@
     virtual ~MainWindow();
 
 signals:
-    virtual void canChangeSolo(bool);
-    virtual void canAlign(bool);
+    void canChangeSolo(bool);
+    void canAlign(bool);
 
 public slots:
     virtual void preferenceChanged(PropertyContainer::PropertyName);
diff -r 84fd4bb8d656 -r 3d1c69b2215e main/main.cpp
--- a/main/main.cpp	Mon Oct 18 13:44:25 2010 +0100
+++ b/main/main.cpp	Mon Oct 18 13:47:21 2010 +0100
@@ -209,6 +209,8 @@
 int
 main(int argc, char **argv)
 {
+    svSystemSpecificInitialisation();
+
 #ifdef Q_WS_X11
 #if QT_VERSION >= 0x040500
 //    QApplication::setGraphicsSystem("raster");
@@ -227,8 +229,6 @@
     signal(SIGQUIT, signalHandler);
 #endif
 
-    svSystemSpecificInitialisation();
-
     bool audioOutput = true;
     bool oscSupport = true;