# HG changeset patch
# User unc0rr
# Date 1419962403 -10800
# Node ID d58d7d8b53927728a09f2011f6707c25eb773f05
# Parent  37264e44ec0fb84c7056af567972724cdeada115# Parent  2cfa650836218a0d02713458465f8905397968bf
Merge fixes from .21 branch

diff -r 37264e44ec0f -r d58d7d8b5392 CMakeLists.txt
diff -r 37264e44ec0f -r d58d7d8b5392 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Sat Dec 27 11:36:28 2014 -0500
+++ b/QTfrontend/hwform.cpp	Tue Dec 30 21:00:03 2014 +0300
@@ -1832,7 +1832,7 @@
     if (hwnet)
     {
         NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
-        connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
+        connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList)));
 
         ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
 
diff -r 37264e44ec0f -r d58d7d8b5392 QTfrontend/model/ammoSchemeModel.cpp
--- a/QTfrontend/model/ammoSchemeModel.cpp	Sat Dec 27 11:36:28 2014 -0500
+++ b/QTfrontend/model/ammoSchemeModel.cpp	Tue Dec 30 21:00:03 2014 +0300
@@ -845,7 +845,7 @@
     return netScheme[index.column()];
 }
 
-void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg)
+void NetAmmoSchemeModel::setNetSchemeConfig(QStringList cfg)
 {
     if(cfg.size() != netScheme.size())
     {
diff -r 37264e44ec0f -r d58d7d8b5392 QTfrontend/model/ammoSchemeModel.h
--- a/QTfrontend/model/ammoSchemeModel.h	Sat Dec 27 11:36:28 2014 -0500
+++ b/QTfrontend/model/ammoSchemeModel.h	Tue Dec 30 21:00:03 2014 +0300
@@ -70,7 +70,7 @@
         QVariant data(const QModelIndex &index, int role) const;
 
     public slots:
-        void setNetSchemeConfig(QStringList & cfg);
+        void setNetSchemeConfig(QStringList cfg);
 
     private:
         QList<QVariant> netScheme;
diff -r 37264e44ec0f -r d58d7d8b5392 QTfrontend/net/newnetclient.h
--- a/QTfrontend/net/newnetclient.h	Sat Dec 27 11:36:28 2014 -0500
+++ b/QTfrontend/net/newnetclient.h	Tue Dec 30 21:00:03 2014 +0300
@@ -111,7 +111,7 @@
         void roomNameUpdated(const QString & name);
         void askForRoomPassword();
 
-        void netSchemeConfig(QStringList &);
+        void netSchemeConfig(QStringList);
         void paramChanged(const QString & param, const QStringList & value);
         void configAsked();
 
diff -r 37264e44ec0f -r d58d7d8b5392 cmake_modules/CheckHaskellModuleExists.cmake
--- a/cmake_modules/CheckHaskellModuleExists.cmake	Sat Dec 27 11:36:28 2014 -0500
+++ b/cmake_modules/CheckHaskellModuleExists.cmake	Tue Dec 30 21:00:03 2014 +0300
@@ -30,11 +30,11 @@
                     "-DPARAMETERS=${PARAMETERS}"
                     -cpp
                     -c "${CMAKE_MODULE_PATH}/checkModule.hs"
+                    RESULT_VARIABLE COMMAND_RESULT
                     ERROR_VARIABLE BUILD_ERROR
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     )
-
-    if("${BUILD_ERROR}" STREQUAL "")
+    if(${COMMAND_RESULT} EQUAL 0)
       message(STATUS "Looking for ${FUNCTION} in ${MODULE} - found")
       set(${VARIABLE} 1 CACHE INTERNAL "Have module ${MODULE}")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log