jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 19:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

mutex fixes, server shutdown works again

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-17 19:05:22 +01:00
parent d792c3ddc6
commit 671214c60e
9 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
servatrice/src/servatrice.h
View file

@ -82,6 +82,8 @@ class Servatrice : public Server
private slots:
void statusUpdate();
void shutdownTimeout();
public slots:
void scheduleShutdown(const QString &reason, int minutes);
public:
mutable QMutex dbMutex;
Servatrice(QSettings *_settings, QObject *parent = 0);
@ -110,7 +112,6 @@ public:
QMap<QString, ServerInfo_User> getIgnoreList(const QString &name);
bool isInBuddyList(const QString &whoseList, const QString &who);
bool isInIgnoreList(const QString &whoseList, const QString &who);
void scheduleShutdown(const QString &reason, int minutes);
void incTxBytes(quint64 num);
void incRxBytes(quint64 num);
int getUserIdInDB(const QString &name);