better ^Q behaviour

jcupitt · jcupitt · commit 0c8ed95d4719 · 2013-10-07T14:51:38.000+01:00
see #27 thanks MvGulik
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+started 7.36.1 7/10/13
+- better ^Q behaviour, thanks MvGulik
+
 started 7.36.0 3/10/13
 
 started 7.35.0 9/8/13
diff --git a/src/filemodel.c b/src/filemodel.c
@@ -829,7 +829,7 @@ filemodel_inter_close_cb( iWindow *iwnd, void *client,
 {
 	Filemodel *filemodel = FILEMODEL( client );
 
-	IDESTROY( filemodel );
+	iwindow_kill( filemodel_get_window_hint( filemodel ) ); 
 
 	nfn( sys, IWINDOW_YES );
 }
@@ -933,17 +933,35 @@ filemodel_inter_replace( iWindow *parent, Filemodel *filemodel )
 /* Close all registered filemodels.
  */
 
+/* The first registered, modified filemodel the user hasn't said "ok!!! ffs"
+ * to.
+ */
+static Filemodel *
+filemodel_inter_close_get_filemodel( void )
+{
+	GSList *p;
+
+	for( p = filemodel_registered; p; p = p->next ) {
+		Filemodel *filemodel = FILEMODEL( p->data );
+
+		if( filemodel->modified )
+			return( filemodel );
+	}
+
+	return( NULL );
+}
+
 void
 filemodel_inter_close_registered_cb( iWindow *iwnd, void *client, 
 	iWindowNotifyFn nfn, void *sys )
 {
-	if( filemodel_registered ) {
-		Filemodel *filemodel = FILEMODEL( filemodel_registered->data );
+	Filemodel *filemodel; 
+
+	if( (filemodel = filemodel_inter_close_get_filemodel()) ) { 
 		iWindowSusp *susp = iwindow_susp_new( 
 			filemodel_inter_close_registered_cb, 
 			iwnd, client, nfn, sys );
 
-		filemodel_unregister( filemodel );
 		filemodel_inter_savenclose_cb( 
 			filemodel_get_window_hint( filemodel ), filemodel, 
 			iwindow_susp_comp, susp );
diff --git a/src/filesel.c b/src/filesel.c
@@ -1052,11 +1052,12 @@ filesel_refresh( Filesel *filesel )
 {
 	char *dir;
 
-	dir = gtk_file_chooser_get_current_folder( 
-		GTK_FILE_CHOOSER( filesel->chooser ) );
-	gtk_file_chooser_set_current_folder(
-		GTK_FILE_CHOOSER( filesel->chooser ), dir );
-	g_free( dir );
+	if( (dir = gtk_file_chooser_get_current_folder( 
+		GTK_FILE_CHOOSER( filesel->chooser ) )) ) { 
+		gtk_file_chooser_set_current_folder(
+			GTK_FILE_CHOOSER( filesel->chooser ), dir );
+		g_free( dir );
+	}
 
         return( NULL );
 }
diff --git a/src/iwindow.c b/src/iwindow.c
@@ -435,6 +435,13 @@ iwindow_susp_return( void *sys, iWindowResult result )
         im_free( susp );
 }
 
+void
+iwindow_susp_trigger( iWindowSusp *susp )
+{
+	susp->fn( susp->iwnd, susp->client, susp->nfn, susp->sys );
+	im_free( susp );
+}
+
 /* Compose two iWindowFns ... if this one succeeded, trigger the next in turn.
  * Otherwise bail out.
  */
@@ -443,10 +450,8 @@ iwindow_susp_comp( void *sys, iWindowResult result )
 {
 	iWindowSusp *susp = IWINDOW_SUSP( sys );
 
-	if( result == IWINDOW_YES ) {
-		susp->fn( susp->iwnd, susp->client, susp->nfn, susp->sys );
-		im_free( susp );
-	}
+	if( result == IWINDOW_YES ) 
+		iwindow_susp_trigger( susp ); 
 	else 
 		iwindow_susp_return( sys, result );
 }
diff --git a/src/iwindow.h b/src/iwindow.h
@@ -216,6 +216,7 @@ void iwindow_cursor_context_destroy( iWindowCursorContext *cntxt );
 
 iWindowSusp *iwindow_susp_new( iWindowFn, 
 	iWindow *, void *, iWindowNotifyFn, void * );
+void iwindow_susp_trigger( iWindowSusp * ); 
 void iwindow_susp_return( void *, iWindowResult );
 void iwindow_susp_comp( void *, iWindowResult );
 
