Merge pull request #529 from flukiluke/kdialog-fixes

Fix calls to kdialog so filters work
QB64-Phoenix-Edition · Aug 17, 2024 · 810c80f · 810c80f
2 parents ee247e6 + b569723
commit 810c80f
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/internal/c/parts/gui/tinyfiledialogs.c b/internal/c/parts/gui/tinyfiledialogs.c
@@ -45,6 +45,9 @@ misrepresented as being the original software.
 Thanks for contributions, bug corrections & thorough testing to:
 - Don Heyse http://ldglite.sf.net for bug corrections & thorough testing!
 - Paul Rouget
+
+This software has been modified by the QB64PE project and has diverged from
+the tinyfiledialogs distribution source.
 */
 
 
@@ -5436,16 +5439,19 @@ char * tinyfd_saveFileDialog(
                 if ( aNumOfFilterPatterns > 0 )
                 {
                         strcat(lDialogString , " '" ) ;
-						strcat( lDialogString , aFilterPatterns[0] ) ;
-                        for ( i = 1 ; i < aNumOfFilterPatterns ; i ++ )
+                        if ( aSingleFilterDescription && strlen(aSingleFilterDescription) )
                         {
-							strcat( lDialogString , " " ) ;
-							concatAndEscapeSingleQuote( lDialogString , aFilterPatterns[i] ) ;
+                            concatAndEscapeSingleQuote( lDialogString , aSingleFilterDescription ) ;
+                            strcat( lDialogString , " (" ) ;
+                        }
+                        for ( i = 0 ; i < aNumOfFilterPatterns ; i ++ )
+                        {
+                            strcat( lDialogString , " " ) ;
+                            concatAndEscapeSingleQuote( lDialogString , aFilterPatterns[i] ) ;
                         }
                         if ( aSingleFilterDescription && strlen(aSingleFilterDescription) )
                         {
-                                strcat( lDialogString , " | " ) ;
-                                concatAndEscapeSingleQuote( lDialogString , aSingleFilterDescription ) ;
+                                strcat( lDialogString , ")" ) ;
                         }
                         strcat( lDialogString , "'" ) ;
                 }
@@ -5831,16 +5837,19 @@ char * tinyfd_openFileDialog(
                 if ( aNumOfFilterPatterns > 0 )
                 {
                         strcat(lDialogString , " '" ) ;
-						strcat( lDialogString , aFilterPatterns[0] ) ;
-                        for ( i = 1 ; i < aNumOfFilterPatterns ; i ++ )
+                        if ( aSingleFilterDescription && strlen(aSingleFilterDescription) )
                         {
-							strcat( lDialogString , " " ) ;
-							concatAndEscapeSingleQuote( lDialogString , aFilterPatterns[i] ) ;
+                            concatAndEscapeSingleQuote( lDialogString , aSingleFilterDescription ) ;
+                            strcat( lDialogString , " (" ) ;
+                        }
+                        for ( i = 0 ; i < aNumOfFilterPatterns ; i ++ )
+                        {
+                            strcat( lDialogString , " " ) ;
+                            concatAndEscapeSingleQuote( lDialogString , aFilterPatterns[i] ) ;
                         }
                         if ( aSingleFilterDescription && strlen(aSingleFilterDescription) )
                         {
-                                strcat( lDialogString , " | " ) ;
-                                concatAndEscapeSingleQuote( lDialogString , aSingleFilterDescription ) ;
+                                strcat( lDialogString , ")" ) ;
                         }
                         strcat( lDialogString , "'" ) ;
                 }