Ticket #7259: gbee-7259.patch
File gbee-7259.patch, 1.3 KB (added by , 14 years ago) |
---|
-
programs/mythtv-setup/importicons.cpp
109 109 if (m_nMaxCount > 0) 110 110 { 111 111 m_missingIter = m_missingEntries.begin(); 112 doLoad(); 112 if (!doLoad()) 113 { 114 if (!m_strMatches.isEmpty()) 115 askSubmit(m_strMatches); 116 } 113 117 } 114 118 } 115 119 … … 162 166 m_missingIter++; 163 167 164 168 if (!doLoad()) 165 Close(); 169 { 170 if (!m_strMatches.isEmpty()) 171 askSubmit(m_strMatches); 172 else 173 Close(); 174 } 166 175 } 167 176 168 177 void ImportIconsWizard::menuSelection(MythUIButtonListItem *item) … … 209 218 m_missingCount++; 210 219 m_missingIter++; 211 220 if (!doLoad()) 212 Close(); 221 { 222 if (!m_strMatches.isEmpty()) 223 askSubmit(m_strMatches); 224 else 225 Close(); 226 } 213 227 } 214 228 else 215 229 { … … 390 404 { 391 405 VERBOSE(VB_CHANNEL, "doLoad Icon search complete"); 392 406 enableControls(STATE_DISABLED); 393 if (!m_strMatches.isEmpty())394 askSubmit(m_strMatches);395 407 return false; 396 408 } 397 409 else