rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6471 Reverted accidental change and fixed more tabs

This commit is contained in:
Jamie Newbon 2019-04-30 15:49:23 +01:00
parent 207247b7ef
commit 6c6e2b6bd3
No known key found for this signature in database
GPG Key ID: 9618C9BB2FF44DB5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/src/MainWindow.h
View File

@ -74,7 +74,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
synergyConnecting, synergyConnecting,
synergyConnected, synergyConnected,
synergyListening, synergyListening,
synergyPendingRetry synergyPendingRetry
}; };
enum qSynergyType enum qSynergyType
@ -139,7 +139,7 @@ public slots:
void appendLogDebug(const QString& text); void appendLogDebug(const QString& text);
void appendLogError(const QString& text); void appendLogError(const QString& text);
void startSynergy(); void startSynergy();
void retryStart(); // If the connection failed this will retry a startSynergy void retryStart(); // If the connection failed this will retry a startSynergy
protected slots: protected slots:
void sslToggled(bool enabled); void sslToggled(bool enabled);

2
src/lib/platform/XWindowsUtil.cpp
View File

@ -1303,7 +1303,7 @@ XWindowsUtil::getWindowProperty(Display* display, Window window,
int actualDatumSize; int actualDatumSize;
// ignore errors. XGetWindowProperty() will report failure. // ignore errors. XGetWindowProperty() will report failure.
// XWindowsUtil::ErrorLock lock(display); XWindowsUtil::ErrorLock lock(display);
// read the property // read the property
bool okay = true; bool okay = true;