diff options
author | Søren Sandmann Pedersen <ssp@dhcp-100-2-40.bos.redhat.com> | 2009-04-13 19:20:15 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <ssp@dhcp-100-2-40.bos.redhat.com> | 2009-04-13 19:20:15 -0400 |
commit | c10cc32ff0db3c104998f3b4387566cadd33e45d (patch) | |
tree | 85d66028caa5aaa013eee52903999e9bf4358def | |
parent | 22f04c7462ae7faa989f107710330e7f49a1ddd0 (diff) |
Don't use existing blank window
-rw-r--r-- | siv.c | 20 |
1 files changed, 3 insertions, 17 deletions
@@ -371,19 +371,12 @@ open_file (App *app, const char *filename, GPtrArray *err_files) { SivWindow *window = NULL; GError *err = NULL; - gboolean new_window = FALSE; int i; for (i = 0; i < app->windows->len; ++i) { SivWindow *w = app->windows->pdata[i]; - if (window_is_blank (w)) - { - window = w; - break; - } - if (window_matches_file (w, filename)) { window_show (w, GDK_CURRENT_TIME); @@ -391,21 +384,14 @@ open_file (App *app, const char *filename, GPtrArray *err_files) } } - if (!window) - { - window = window_new (app); - - new_window = TRUE; - } - + window = window_new (app); + if (!window_load_file (window, filename, &err)) { if (err_files) g_ptr_array_add (err_files, g_strdup (filename)); - if (new_window) - window_free (window); - + window_free (window); return FALSE; } |