Ticket #7617: mythtv-7617-GetGroupToUse_QString_usage.patch

libs/libmyth/storagegroup.cpp

@@ -1128 +1128 @@
 QString StorageGroup::GetGroupToUse(
     const QString &host, const QString &sgroup)
 {
-    QString tmpGroup = sgroup;
-    QString groupKey = QString("%1:%2").arg(sgroup).arg(host);
+    QString hostname = host;
+    QString storage_group = sgroup;
+    hostname.detach();
+    storage_group.detach();
+
+    QString tmpGroup = storage_group;
+    QString groupKey = QString("%1:%2").arg(storage_group).arg(hostname);
 
     QMutexLocker locker(&s_groupToUseLock);
 
@@ -1139 +1144 @@
     }
     else
     {
-        if (StorageGroup::FindDirs(sgroup, host))
+        if (StorageGroup::FindDirs(storage_group, hostname))
         {
-            s_groupToUseCache[groupKey] = sgroup;
+            s_groupToUseCache[groupKey] = storage_group;
         }
         else
         {
             VERBOSE(VB_FILE+VB_EXTRA,
-                    QString("GetHostSGToUse(): "
+                    QString("GetGroupToUse(): "
                             "falling back to Videos Storage Group for host %1 "
                             "since it does not have a %2 Storage Group.")
-                    .arg(host).arg(sgroup));
+                    .arg(hostname).arg(storage_group));
 
             tmpGroup = "Videos";
             s_groupToUseCache[groupKey] = tmpGroup;