diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-01-27 21:18:24 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-02-11 23:12:13 +0100 |
| commit | d37064aa5adb51586f8f694dbf12b9ac708fbce0 (patch) | |
| tree | d6f0ca2d2bed93853753888e495c6c1b31637069 | |
| parent | 9625791018950c5f20466f1f290de8178450fc01 (diff) | |
| download | qutebrowser-d37064aa5adb51586f8f694dbf12b9ac708fbce0.tar.gz qutebrowser-d37064aa5adb51586f8f694dbf12b9ac708fbce0.zip | |
Fix restoring of cmd widget after an error.
We accidentally restored the prompt widget instead of the command widget when
an immediate error message interrupted command mode.
Fixes #487.
Conflicts (cherry-pick):
qutebrowser/mainwindow/statusbar/bar.py
| -rw-r--r-- | qutebrowser/mainwindow/statusbar/bar.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py index 38cb1fa7a..2fddbecaf 100644 --- a/qutebrowser/mainwindow/statusbar/bar.py +++ b/qutebrowser/mainwindow/statusbar/bar.py @@ -252,7 +252,7 @@ class StatusBar(QWidget): if self._previous_widget == PreviousWidget.prompt: self._stack.setCurrentWidget(self.prompt) elif self._previous_widget == PreviousWidget.command: - self._stack.setCurrentWidget(self.command) + self._stack.setCurrentWidget(self.cmd) elif self._previous_widget == PreviousWidget.none: pass else: @@ -267,7 +267,7 @@ class StatusBar(QWidget): def _show_cmd_widget(self): """Show command widget instead of temporary text.""" self._set_error(False) - self._previous_widget = PreviousWidget.prompt + self._previous_widget = PreviousWidget.command if self._text_pop_timer.isActive(): self._timer_was_active = True self._text_pop_timer.stop() |