Skip to content

Commit

Permalink
Prevent account hierarchy assistant from opening a second account hie…
Browse files Browse the repository at this point in the history
…rarchy upon completion

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23600 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
gjanssens committed Dec 23, 2013
1 parent 72c256e commit f94b27f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
7 changes: 2 additions & 5 deletions src/gnome/assistant-hierarchy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1160,11 +1160,8 @@ gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults,
}

static void
create_account_page(void)
after_assistant(void)
{
GncPluginPage *page;
page = gnc_plugin_page_account_tree_new();
gnc_main_window_open_page(NULL, page);
qof_book_mark_session_dirty(gnc_get_current_book());
gnc_ui_file_access_for_save_as();
}
Expand All @@ -1174,7 +1171,7 @@ gnc_ui_hierarchy_assistant_hook (void)
{
if (gnc_prefs_get_bool(GNC_PREFS_GROUP, GNC_PREF_SHOW_ON_NEW_FILE))
{
gnc_ui_hierarchy_assistant_with_callback(TRUE, create_account_page);
gnc_ui_hierarchy_assistant_with_callback(TRUE, after_assistant);
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/gnome/dialog-new-user.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,9 @@ gnc_set_first_startup (gboolean first_startup)
static void
after_hierarchy_assistant(void)
{
GncPluginPage *page;

gncp_new_user_finish ();
gnc_set_first_startup (FALSE);

page = gnc_plugin_page_account_tree_new();
gnc_main_window_open_page(NULL, page);
qof_book_mark_session_dirty(gnc_get_current_book());
gnc_ui_file_access_for_save_as();
}
Expand Down

0 comments on commit f94b27f

Please sign in to comment.