summaryrefslogtreecommitdiff
path: root/library/Core.cpp
diff options
context:
space:
mode:
authorjj2012-06-28 15:02:48 +0200
committerjj2012-06-28 15:05:00 +0200
commitccbebdafb0f345275ccddfb96c93d12cdd0b953d (patch)
tree51505256caf6855bb9c0b41690c00eaaff6e3519 /library/Core.cpp
parent24aa3827c11dca4a1cfa7cdd8c18b7c527b81430 (diff)
downloaddfhack-ccbebdafb0f345275ccddfb96c93d12cdd0b953d.tar.gz
dfhack-ccbebdafb0f345275ccddfb96c93d12cdd0b953d.tar.bz2
dfhack-ccbebdafb0f345275ccddfb96c93d12cdd0b953d.tar.xz
fix error spam when using Zoom hotkeys
Diffstat (limited to 'library/Core.cpp')
-rw-r--r--library/Core.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/Core.cpp b/library/Core.cpp
index ad9fdc61..09344135 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1224,7 +1224,8 @@ bool Core::ncurses_wgetch(int in, int & out)
{
df::viewscreen * ws = Gui::GetCurrentScreen();
if (strict_virtual_cast<df::viewscreen_dwarfmodest>(ws) &&
- df::global::ui->main.mode != ui_sidebar_mode::Hotkeys)
+ df::global::ui->main.mode != ui_sidebar_mode::Hotkeys &&
+ df::global::ui->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
{
setHotkeyCmd(df::global::ui->main.hotkeys[idx].name);
return false;
@@ -1372,7 +1373,8 @@ bool Core::SelectHotkey(int sym, int modifiers)
idx += 8;
if (strict_virtual_cast<df::viewscreen_dwarfmodest>(screen) &&
- df::global::ui->main.mode != ui_sidebar_mode::Hotkeys)
+ df::global::ui->main.mode != ui_sidebar_mode::Hotkeys &&
+ df::global::ui->main.hotkeys[idx].cmd == df::ui_hotkey::T_cmd::None)
{
cmd = df::global::ui->main.hotkeys[idx].name;
}