equal
deleted
inserted
replaced
181 GlxContextRole); |
181 GlxContextRole); |
182 |
182 |
183 GlxAlbumSelectionPopup popupWidget; |
183 GlxAlbumSelectionPopup popupWidget; |
184 QModelIndexList modelList = popupWidget.GetSelectionList(albumMediaModel, &ok); |
184 QModelIndexList modelList = popupWidget.GetSelectionList(albumMediaModel, &ok); |
185 if(ok && modelList.count() == 0) |
185 if(ok && modelList.count() == 0) |
186 { |
186 { |
187 createNewMedia(); |
187 createNewMedia(); |
188 ok = false; |
188 ok = false; |
189 } |
189 } |
|
190 else if(!ok) |
|
191 { |
|
192 // Reset the flag so that next addmedia cmd can be executed |
|
193 iIsCmdActive = false; |
|
194 } |
190 OstTraceExt2( TRACE_NORMAL, GLXCOMMANDHANDLERADDTOCONTAINER_CREATECOMMANDL, "GlxCommandHandlerAddToContainer::CreateCommandL;ok=%d;newMedia=%d", ok, mNewMediaAdded ); |
195 OstTraceExt2( TRACE_NORMAL, GLXCOMMANDHANDLERADDTOCONTAINER_CREATECOMMANDL, "GlxCommandHandlerAddToContainer::CreateCommandL;ok=%d;newMedia=%d", ok, mNewMediaAdded ); |
191 |
196 |
192 if (ok || mNewMediaAdded) |
197 if (ok || mNewMediaAdded) |
193 { |
198 { |
194 int count = modelList.count(); |
199 int count = modelList.count(); |
218 CleanupStack::Pop(command); |
223 CleanupStack::Pop(command); |
219 mNewMediaAdded = false; |
224 mNewMediaAdded = false; |
220 } |
225 } |
221 else |
226 else |
222 { |
227 { |
|
228 // Reset the flag so that next addmedia cmd can be executed |
|
229 iIsCmdActive = false; |
223 MGlxMediaList::UnmarkAllL(aMediaList); |
230 MGlxMediaList::UnmarkAllL(aMediaList); |
224 } |
231 } |
225 |
232 |
226 MGlxMediaList::UnmarkAllL(*targetMediaList); |
233 MGlxMediaList::UnmarkAllL(*targetMediaList); |
227 targetMediaList->Close(); |
234 targetMediaList->Close(); |