summary refs log tree commit diff
path: root/src/MainWindow.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
commit99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6 (patch)
treeb337a2a83b3795518f6f82bbad85938fea40d916 /src/MainWindow.cpp
parentImplement signature upload for own master key (diff)
parentMerge pull request #294 from trilene/master (diff)
downloadnheko-99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6.tar.xz
Merge remote-tracking branch 'origin/master' into cross-signing
Diffstat (limited to 'src/MainWindow.cpp')
-rw-r--r--src/MainWindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp

index 63722372..b6ad8bbe 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp
@@ -288,7 +288,7 @@ MainWindow::showChatPage() void MainWindow::closeEvent(QCloseEvent *event) { - if (WebRTCSession::instance().state() != WebRTCSession::State::DISCONNECTED) { + if (WebRTCSession::instance().state() != webrtc::State::DISCONNECTED) { if (QMessageBox::question(this, "nheko", "A call is in progress. Quit?") != QMessageBox::Yes) { event->ignore(); @@ -431,7 +431,7 @@ MainWindow::openLogoutDialog() { auto dialog = new dialogs::Logout(this); connect(dialog, &dialogs::Logout::loggingOut, this, [this]() { - if (WebRTCSession::instance().state() != WebRTCSession::State::DISCONNECTED) { + if (WebRTCSession::instance().state() != webrtc::State::DISCONNECTED) { if (QMessageBox::question( this, "nheko", "A call is in progress. Log out?") != QMessageBox::Yes) {