# HG changeset patch # User ib # Date 1355163274 0 # Node ID 5f7a983fc8381df436fdcd5002f2f89a8cdc768d # Parent 8d4a7387d592ec44a33e3d144b0e97394e41b4e0 Embrace several individual "if (guiInfo.Playing)" conditions. This simplifies the individual conditions. diff -r 8d4a7387d592 -r 5f7a983fc838 gui/interface.c --- a/gui/interface.c Mon Dec 10 14:08:19 2012 +0000 +++ b/gui/interface.c Mon Dec 10 18:14:34 2012 +0000 @@ -812,20 +812,21 @@ uiEventHandling(ivRedraw, 1); - if (!guiInfo.PlaylistNext && guiInfo.Playing) { + if (guiInfo.Playing) { + if (!guiInfo.PlaylistNext) { guiInfo.PlaylistNext = True; break; } - if ((guiInfo.StreamType == STREAMTYPE_CDDA) && (guiInfo.Track < guiInfo.Tracks) && guiInfo.Playing) { + if (guiInfo.StreamType == STREAMTYPE_CDDA && guiInfo.Track < guiInfo.Tracks) { uiNext(); break; } - if (guiInfo.Playing) next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0); + } - if (guiInfo.Playing && next) { + if (next) { uiSetFile(next->path, next->name, STREAMTYPE_FILE); guiInfo.NewPlay = GUI_FILE_NEW; guiInfo.Track = (int)listMgr(PLAYLIST_ITEM_GET_POS, next);