Merge branch 'master' into otr

2014-01-12 01:25:35 +00:00
parent 462e84ea82 f1bd350567
commit 4e97c1e460
2 changed files with 5 additions and 2 deletions
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -326,8 +326,10 @@ win_handle_error_message(ProfWin *window, const char * const from,
        case WIN_DUCK:
        case WIN_CONSOLE:
            handled =  FALSE;
+            break;
        case WIN_MUC:
            handled = _muc_handle_error_message(window, from, err_msg);
+            break;
        default:
            assert(FALSE);
            break;