Ticket #3737: mythmusic-editmeta_v1.diff

mythplugins/mythmusic/mythmusic/playbackbox.cpp

@@ -986 +986 @@
 
     // store the current track metadata in case the track changes
     // while we show the edit dialog
-    Metadata *editMeta = curMeta;
     GenericTree *node = music_tree_list->getCurrentNode();
+    Metadata *editMeta = all_music->getMetadata( node->getInt() );
 
     EditMetadataDialog editDialog(editMeta, gContext->GetMainWindow(),
                       "edit_metadata", "music-", "edit metadata");
@@ -1007 +1007 @@
                if (curMeta->ID() == editMeta->ID())
                {
                     *curMeta = editMeta;
-                    if (title_text)
-                        title_text->SetText(curMeta->FormatTitle());
-                    if (artist_text)
-                        artist_text->SetText(curMeta->FormatArtist());
-                    if (album_text)
-                        album_text->SetText(curMeta->Album());
-
-                    setTrackOnLCD(curMeta);
+                    updateTrackInfo(curMeta);
                }
            }
         }
@@ -2076 +2069 @@
         //  It's a track
 
         curMeta = all_music->getMetadata(node_int);
-        if (title_text)
-            title_text->SetText(curMeta->FormatTitle());
-        if (artist_text)
-            artist_text->SetText(curMeta->FormatArtist());
-        if (album_text)
-            album_text->SetText(curMeta->Album());
 
-        setTrackOnLCD(curMeta);
+        updateTrackInfo(curMeta);
 
         maxTime = curMeta->Length() / 1000;