# HG changeset patch
# User ib
# Date 1385730631 0
# Node ID 08f21a09a545637f5fc262e09d5885cfa2e564aa
# Parent  28ea255e40ce245eff0be24bfef8de58302b89d8
Don't discard current DVD track information without cause.

In case STREAM_CTRL_GET_CURRENT_TITLE fails, use the information the
GUI already has (though it might be inaccurate in extremely rare cases).

diff -r 28ea255e40ce -r 08f21a09a545 gui/interface.c
--- a/gui/interface.c	Fri Nov 29 12:41:32 2013 +0000
+++ b/gui/interface.c	Fri Nov 29 13:10:31 2013 +0000
@@ -628,9 +628,8 @@
             stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters);
             guiInfo.Angles = 0;
             stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles);
-            guiInfo.Track = 0;
-            stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track);
-            guiInfo.Track++;
+            if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK)
+                guiInfo.Track++;
             // guiInfo.Chapter will be set by mplayer
             guiInfo.Angle = 1;
             stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle);
diff -r 28ea255e40ce -r 08f21a09a545 gui/win32/interface.c
--- a/gui/win32/interface.c	Fri Nov 29 12:41:32 2013 +0000
+++ b/gui/win32/interface.c	Fri Nov 29 13:10:31 2013 +0000
@@ -664,9 +664,8 @@
                     stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters);
                     guiInfo.Angles = 0;
                     stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles);
-                    guiInfo.Track = 0;
-                    stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track);
-                    guiInfo.Track++;
+                    if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK)
+                        guiInfo.Track++;
                     // guiInfo.Chapter will be set by mplayer
                     guiInfo.Angle = 1;
                     stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle);