From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Mon, 10 May 2010 11:33:13 +0000 (+0000)
Subject: Some small logic mistakes
X-Git-Tag: 1.1~100
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=b71da225f077c5268a525886967be68739c5be94

Some small logic mistakes

Use boolean operators for booleans and bitwise otherwise only.
---

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 89865f71..d26d2613 100644
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -1014,11 +1014,11 @@ void vficon_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
 			{
 			case MTS_MODE_SET: selected = mark_val;
 				break;
-			case MTS_MODE_OR: selected = mark_val | selected;
+			case MTS_MODE_OR: selected = mark_val || selected;
 				break;
-			case MTS_MODE_AND: selected = mark_val & selected;
+			case MTS_MODE_AND: selected = mark_val && selected;
 				break;
-			case MTS_MODE_MINUS: selected = !mark_val & selected;
+			case MTS_MODE_MINUS: selected = !mark_val && selected;
 				break;
 			}
 
diff --git a/src/view_file_list.c b/src/view_file_list.c
index 53c673ab..ca16324c 100644
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -1610,11 +1610,11 @@ void vflist_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
 			{
 			case MTS_MODE_SET: selected = mark_val;
 				break;
-			case MTS_MODE_OR: selected = mark_val | selected;
+			case MTS_MODE_OR: selected = mark_val || selected;
 				break;
-			case MTS_MODE_AND: selected = mark_val & selected;
+			case MTS_MODE_AND: selected = mark_val && selected;
 				break;
-			case MTS_MODE_MINUS: selected = !mark_val & selected;
+			case MTS_MODE_MINUS: selected = !mark_val && selected;
 				break;
 			}