summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-11-22 22:34:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-11-22 22:34:49 +0300
commit69f04f12d9793e93ea76874f71b7c99c55459b10 (patch)
tree722ed2fa069c4f58f0415c3004ebae5e67f66016
parentce1d5543c64be5c101908c20768ecb448737f2d0 (diff)
downloadmv-69f04f12d9793e93ea76874f71b7c99c55459b10.tar.gz
mv-69f04f12d9793e93ea76874f71b7c99c55459b10.tar.bz2
mv-69f04f12d9793e93ea76874f71b7c99c55459b10.tar.xz
mv-69f04f12d9793e93ea76874f71b7c99c55459b10.zip
Fix drops shortcuts loading.
-rw-r--r--src/dropshortcut.cpp7
-rw-r--r--src/dropshortcut.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 4e0718d16..1211c228d 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -43,7 +43,7 @@ DropShortcut::DropShortcut() :
mItemColorSelected(1),
mLastDropIndex(0)
{
- clear();
+ clear(false);
load();
}
@@ -224,12 +224,13 @@ void DropShortcut::setItem(const int index)
save();
}
-void DropShortcut::clear()
+void DropShortcut::clear(bool isSave)
{
for (int i = 0; i < DROP_SHORTCUT_ITEMS; i++)
{
mItems[i] = -1;
mItemColors[i] = 1;
}
- save();
+ if (isSave)
+ save();
}
diff --git a/src/dropshortcut.h b/src/dropshortcut.h
index 7f3ec46eb..3026ee9f5 100644
--- a/src/dropshortcut.h
+++ b/src/dropshortcut.h
@@ -146,7 +146,7 @@ class DropShortcut final
*/
void dropItems(const int cnt = 1);
- void clear();
+ void clear(bool isSave = true);
private: