Skip to content

Commit

Permalink
Fix #2584 by reverting introduction of log message with PR #2580
Browse files Browse the repository at this point in the history
The logic does not handle all cases. Specifically, it does not handle
the normal connect case correctly (which is a "not found" case as well)

When working on a fix, more changes seemed reasonable, which resulted
in PR #2590 which is not trivial and not ready yet.

In order for the issue #2584 to not persist longer than necessary, revert
the change that introduced it. The PR #2590 will reintroduce the log
message and other changes later on.

This reverts commit 9c5d02c
(merge commit 4add9ce)
  • Loading branch information
Kissaki committed Nov 5, 2016
1 parent b595d65 commit 94b05db
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/mumble/MainWindow.cpp
Expand Up @@ -931,11 +931,8 @@ void MainWindow::findDesiredChannel() {
g.sh->joinChannel(g.uiSession, chan->iId);
}
qtvUsers->setCurrentIndex(pmModel->index(chan));
} else {
g.l->log(Log::Information, tr("The targeted channel could not be found."));
if (g.uiSession) {
qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel));
}
} else if (g.uiSession) {
qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel));
}
updateMenuPermissions();
}
Expand Down

0 comments on commit 94b05db

Please sign in to comment.