Due to logical operations priorities sometimes no suitable resources …

…were shown. Fixed.
mamontov-cpp · Sep 23, 2015 · d7685f9 · d7685f9
1 parent e613120
commit d7685f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugins/ifaceed/ifaceed.pro.user b/plugins/ifaceed/ifaceed.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.0, 2015-09-23T11:35:50. -->
+<!-- Written by QtCreator 3.2.0, 2015-09-23T12:29:04. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/plugins/ifaceed/ifaceed/gui/resourcetreewidget/resourcetreewidget.cpp b/plugins/ifaceed/ifaceed/gui/resourcetreewidget/resourcetreewidget.cpp
@@ -484,7 +484,8 @@ void gui::resourcetreewidget::ResourceTreeWidget::populateTree(
     sad::resource::FolderIterator it = currentfolder->folderListBegin();
     while(it != currentfolder->folderListEnd())
     {
-        result = result || findSuitableFolders(it.value(), suitability);
+        bool suitabilityValue = findSuitableFolders(it.value(), suitability);
+        result = result || suitabilityValue;
         ++it;
     }
 
@@ -496,7 +497,8 @@ void gui::resourcetreewidget::ResourceTreeWidget::populateTree(
         if (list.count())
         {
             const sad::String & name = cur.value()->metaData()->name();
-            result = result || list.indexOf(STD2QSTRING(name)) != -1;
+            bool hasSuitableItem = list.indexOf(STD2QSTRING(name)) != -1;
+            result = result || hasSuitableItem;
         }		
     }