diff options
| author | Simon Rettberg | 2016-11-02 13:57:36 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-11-02 13:57:36 +0100 |
| commit | 1511f2ad55d5941e94af4accfb618b3245c158cd (patch) | |
| tree | 20b6cc0326c7fe16b0a64f0474c0cc9f57ee9ae7 /src/server/mainwindow/mainwindow.h | |
| parent | [server] Show IP address in room layout right after loading it (diff) | |
| download | pvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.tar.gz pvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.tar.xz pvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.zip | |
[server] Run "manager only" logic before creating main window
This prevents the window popping up for a split second when
--manager-only is given and the machine it's running on is not
configured as a manager.
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 5ecda61..b0ad498 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -81,7 +81,6 @@ private: void savePosition(ConnectionFrame *cf); void startVncServerIfNecessary(int from); void tellClientCurrentSituation(Client* client); - void tryToUseRoomTemplate(); void reset(); Client* getClientFromId(int id); ConnectionFrame* getTutorFrame(); @@ -98,7 +97,7 @@ private: void lockContextButtons(); void unlockContextButtons(); - void switchRoomTo(QString); + void reloadCurrentRoom(); protected slots: void onSessionNameClick(); |