XBMC Media Center

Revision: 34893
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34893&view=rev
Author:   vdrfan
Date:     2010-10-20 20:10:46 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
fixed: #10553 - crash on addon configure

(cherry picked from commit 3515f463f18059348ac6b0589829536e19810ec3)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIDialogAddonSettings.cpp

Modified: branches/Dharma/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-10-20 19:40:58 UTC (rev 34892)
+++ branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-10-20 20:10:46 UTC (rev 34893)
@@ -575,6 +575,9 @@
     CStdString entries;
     if (setting->Attribute("entries"))
       entries = setting->Attribute("entries");
+    CStdString defaultValue;
+    if (setting->Attribute("default"))
+      defaultValue= setting->Attribute("default");
     const char *subsetting = setting->Attribute("subsetting");
     CStdString label = GetString(setting->Attribute("label"), subsetting && 0 == strcmpi(subsetting, "true"));
 
@@ -615,7 +618,7 @@
             ((CGUIButtonControl *)pControl)->SetLabel2(value);
         }
         else
-          ((CGUIButtonControl *)pControl)->SetLabel2(setting->Attribute("default"));
+          ((CGUIButtonControl *)pControl)->SetLabel2(defaultValue);
       }
       else if (strcmpi(type, "bool") == 0)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35060
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35060&view=rev
Author:   theuni
Date:     2010-10-28 15:58:51 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
changed: always include local drives in add-on settings folder browse dialogs

(cherry picked from commit f1f2f3df786c322ced8abd87dc9a4a8b2bd39cf4)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIDialogAddonSettings.cpp

Modified: branches/Dharma/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-10-28 15:58:44 UTC (rev 35059)
+++ branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-10-28 15:58:51 UTC (rev 35060)
@@ -288,8 +288,12 @@
             if (!source || strcmpi(source, "local") != 0)
               g_mediaManager.GetNetworkLocations(networkShares);
             localShares.insert(localShares.end(), networkShares.begin(), networkShares.end());
-            shares = &localShares;
           }
+          else // always append local drives
+          {
+            localShares = *shares;
+            g_mediaManager.GetLocalDrives(localShares);
+          }
 
           if (strcmpi(type, "folder") == 0)
           {
@@ -298,12 +302,12 @@
             if (option)
               bWriteOnly = (strcmpi(option, "writeable") == 0);
 
-            if (CGUIDialogFileBrowser::ShowAndGetDirectory(*shares, label, value, bWriteOnly))
+            if (CGUIDialogFileBrowser::ShowAndGetDirectory(localShares, label, value, bWriteOnly))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else if (strcmpi(type, "image") == 0)
           {
-            if (CGUIDialogFileBrowser::ShowAndGetImage(*shares, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetImage(localShares, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else
@@ -348,7 +352,7 @@
               bUseFileDirectories = find(options.begin(), options.end(), "treatasfolder") != options.end();
             }
 
-            if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetFile(localShares, strMask, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35539
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35539&view=rev
Author:   jmarshallnz
Date:     2010-11-30 04:51:34 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
fixed: #10781 - Disallow more than 100 settings per category from addons.

(cherry picked from commit c7319b971a8e95e5f905278142ade0d707c1b39e)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIDialogAddonSettings.cpp

Modified: branches/Dharma/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-11-30 04:51:01 UTC (rev 35538)
+++ branches/Dharma/xbmc/GUIDialogAddonSettings.cpp	2010-11-30 04:51:34 UTC (rev 35539)
@@ -45,6 +45,7 @@
 #include "Settings.h"
 #include "GUIInfoManager.h"
 #include "GUIDialogSelect.h"
+#include "utils/log.h"
 
 using namespace std;
 using namespace ADDON;
@@ -746,6 +747,11 @@
 
     setting = setting->NextSiblingElement("setting");
     controlId++;
+    if (controlId >= CONTROL_START_SECTION)
+    {
+      CLog::Log(LOGERROR, "%s - cannot have more than %d controls per category - simplify your addon!", __FUNCTION__, CONTROL_START_SECTION - CONTROL_START_SETTING);
+      break;
+    }
   }
   EnableControls();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.