summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/widgets/colorpage.cpp1
-rw-r--r--src/gui/windows/shopwindow.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index a668f2d6f..53e312769 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -34,7 +34,6 @@ ColorPage::ColorPage(const Widget2 *const widget,
ListBox(widget, listModel, skin)
{
mItemPadding = mSkin ? mSkin->getOption("itemPadding") : 1;
- mRowHeight = 13;
const Font *const font = getFont();
mRowHeight = CAST_U32(font->getHeight() +
2 * mItemPadding);
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index cf57312dd..b927273ef 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -1026,8 +1026,8 @@ bool ShopWindow::checkFloodCounter(int &counterTime)
counterTime = cur_time;
else if (counterTime + 10 > cur_time)
return false;
-
- counterTime = cur_time;
+ else
+ counterTime = cur_time;
return true;
}