Bookmarks: Fix autoload return from bookmark selection

- Fix placement of parentheses from commit 780990
- Return cancel when play_bookmark fails or user declines
to erase dynamic playlist after warning
- Go back to Playlist Catalogue when user cancels out of
screen

Change-Id: Ibe8c315bdf8c6c9e696f68541b5d4d97dc0e778a

apps/playlist_catalog.c

@@ -217,6 +217,8 @@ restart:
             int res = bookmark_autoload(selected_playlist);
             if (res == BOOKMARK_DO_RESUME)
                result = 0;
+            else if (res == BOOKMARK_CANCEL)
+                goto restart;
             else
             {
                 switch (playlist_viewer_ex(selected_playlist, &most_recent_selection)) {