]> git.sesse.net Git - vlc/commitdiff
Don't abort windows position remembering if small playlist size is invalid at the...
authorClément Stenac <zorglub@videolan.org>
Sat, 18 Mar 2006 16:22:23 +0000 (16:22 +0000)
committerClément Stenac <zorglub@videolan.org>
Sat, 18 Mar 2006 16:22:23 +0000 (16:22 +0000)
modules/gui/wxwidgets/wxwidgets.cpp

index 3b11a138d62565938b1e527add5a67a4ff0700c8..8c7d45aaac3bd2613cda6b4de1e1ba64f30e31a8 100644 (file)
@@ -489,7 +489,9 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf )
 
         id = strtol( psz, &psz, 0 );
         if( *psz != ',' ) /* broken cfg */
+        {
             goto invalid;
+        }
         psz++;
 
         for( i = 0; i < 4; i++ )
@@ -499,13 +501,17 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf )
             if( i < 3 )
             {
                 if( *psz != ',' )
+                {
                     goto invalid;
+                }
                 psz++;
             }
             else
             {
                 if( *psz != ')' )
+                {
                     goto invalid;
+                }
             }
         }
         if( id == ID_SCREEN )
@@ -530,16 +536,22 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf )
     }
 
     if( i_screen_w <= 0 || i_screen_h <= 0 )
+    {
         goto invalid;
+    }
 
     for( i = 0; i < ID_MAX; i++ )
     {
         if( !b_valid[i] )
             continue;
         if( position[i].x < 0 || position[i].y < 0 )
+        {
             goto invalid;
-        if( size[i].x <= 0 || size[i].y <= 0 )
+        }
+        if( i != ID_SMALL_PLAYLIST && (size[i].x <= 0 || size[i].y <= 0)  )
+        {
             goto invalid;
+        }
     }
 
     if( psz_org ) free( psz_org );