Merged 2520 from the 1.0 branch.

This commit is contained in:
Moritz Bunkus 2004-11-26 17:19:27 +00:00
parent 8db9d49f5d
commit fc0d03b31f
2 changed files with 16 additions and 7 deletions

View File

@ -736,14 +736,20 @@ job_dialog::on_item_selected(wxListEvent &evt) {
void
job_dialog::start_jobs(vector<int> &jobs_to_start) {
wxString temp_settings;
job_run_dialog *dlg;
int i;
temp_settings.Printf(wxT("%s/jobs/temp.mmg"), wxGetCwd().c_str());
mdlg->save(temp_settings, true);
dlg = new job_run_dialog(this, jobs_to_start);
delete dlg;
#ifdef SYS_WINDOWS
mdlg->Show(false);
Show(false);
#endif
delete new job_run_dialog(this, jobs_to_start);
#ifdef SYS_WINDOWS
mdlg->Show(true);
Show(true);
#endif
mdlg->load(temp_settings, true);
wxRemoveFile(temp_settings);

View File

@ -942,8 +942,6 @@ mmg_dialog::set_last_chapters_in_menu(wxString name) {
void
mmg_dialog::on_run(wxCommandEvent &evt) {
mux_dialog *mux_dlg;
update_command_line();
if (tc_output->GetValue().Length() == 0) {
@ -966,8 +964,13 @@ mmg_dialog::on_run(wxCommandEvent &evt) {
return;
set_on_top(false);
mux_dlg = new mux_dialog(this);
delete mux_dlg;
#ifdef SYS_WINDOWS
Show(false);
#endif
delete new mux_dialog(this);
#ifdef SYS_WINDOWS
Show(true);
#endif
restore_on_top();
}