diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 55356130..3a75a53d 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -55,6 +55,7 @@
translations/cockatrice_pl.qm
translations/cockatrice_sk.qm
+ resources/countries/ar.svg
resources/countries/at.svg
resources/countries/au.svg
resources/countries/be.svg
diff --git a/cockatrice/resources/countries/ar.svg b/cockatrice/resources/countries/ar.svg
new file mode 100644
index 00000000..543196fc
--- /dev/null
+++ b/cockatrice/resources/countries/ar.svg
@@ -0,0 +1,109 @@
+
+
+
+
\ No newline at end of file
diff --git a/cockatrice/src/localserver.h b/cockatrice/src/localserver.h
index 406b3bff..cf24b438 100644
--- a/cockatrice/src/localserver.h
+++ b/cockatrice/src/localserver.h
@@ -16,6 +16,7 @@ public:
bool getGameShouldPing() const { return false; }
int getMaxGameInactivityTime() const { return 9999999; }
int getMaxPlayerInactivityTime() const { return 9999999; }
+ bool getThreaded() const { return false; }
LocalServerInterface *newConnection();
protected:
diff --git a/common/server.h b/common/server.h
index d2f15e76..de8dd2a5 100644
--- a/common/server.h
+++ b/common/server.h
@@ -40,6 +40,7 @@ public:
virtual int getMaxMessageCountPerInterval() const { return 0; }
virtual int getMaxMessageSizePerInterval() const { return 0; }
virtual int getMaxGamesPerUser() const { return 0; }
+ virtual bool getThreaded() const = 0;
virtual QMap getBuddyList(const QString &name) = 0;
virtual QMap getIgnoreList(const QString &name) = 0;
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 97995e9f..51ad91cb 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -65,7 +65,7 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
statusUpdateClock->start(statusUpdateTime);
}
- bool threaded = settings->value("server/threaded", false).toInt();
+ threaded = settings->value("server/threaded", false).toInt();
tcpServer = new Servatrice_TcpServer(this, threaded, this);
int port = settings->value("server/port", 4747).toInt();
qDebug() << "Starting server on port" << port;
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 5a2fb1b8..8dae2c91 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -68,6 +68,7 @@ public:
int getMaxMessageCountPerInterval() const { return maxMessageCountPerInterval; }
int getMaxMessageSizePerInterval() const { return maxMessageSizePerInterval; }
int getMaxGamesPerUser() const { return maxGamesPerUser; }
+ bool getThreaded() const { return threaded; }
QString getDbPrefix() const { return dbPrefix; }
void updateLoginMessage();
ServerInfo_User *getUserData(const QString &name);
@@ -86,6 +87,7 @@ private:
QString dbPrefix;
QSettings *settings;
int serverId;
+ bool threaded;
int uptime;
QList > addressBanList;
int maxGameInactivityTime, maxPlayerInactivityTime;