/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3470 by persson, Thu Feb 14 19:10:49 2019 UTC revision 3471 by persson, Sat Feb 16 19:13:37 2019 UTC
# Line 1970  Glib::Dispatcher& LoaderSaverBase::signa Line 1970  Glib::Dispatcher& LoaderSaverBase::signa
1970      return error_dispatcher;      return error_dispatcher;
1971  }  }
1972    
1973    void LoaderSaverBase::join() {
1974        thread->join();
1975    }
1976    
1977    
1978  Loader::Loader(const char* filename) :  Loader::Loader(const char* filename) :
1979      LoaderSaverBase(filename, 0)      LoaderSaverBase(filename, 0)
# Line 2258  void MainWindow::on_loader_progress() Line 2262  void MainWindow::on_loader_progress()
2262    
2263  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
2264  {  {
2265        loader->join();
2266      printf("Loader finished!\n");      printf("Loader finished!\n");
2267      printf("on_loader_finished self=%p\n",      printf("on_loader_finished self=%p\n",
2268             static_cast<void*>(Glib::Threads::Thread::self()));             static_cast<void*>(Glib::Threads::Thread::self()));
# Line 2267  void MainWindow::on_loader_finished() Line 2272  void MainWindow::on_loader_finished()
2272    
2273  void MainWindow::on_loader_error()  void MainWindow::on_loader_error()
2274  {  {
2275        loader->join();
2276      Glib::ustring txt = _("Could not load file: ") + loader->error_message;      Glib::ustring txt = _("Could not load file: ") + loader->error_message;
2277      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
2278      msg.run();      msg.run();
# Line 2337  void MainWindow::on_saver_progress() Line 2343  void MainWindow::on_saver_progress()
2343    
2344  void MainWindow::on_saver_error()  void MainWindow::on_saver_error()
2345  {  {
2346        saver->join();
2347      file_structure_changed_signal.emit(this->file);      file_structure_changed_signal.emit(this->file);
2348      Glib::ustring txt = _("Could not save file: ") + saver->error_message;      Glib::ustring txt = _("Could not save file: ") + saver->error_message;
2349      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);      Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
# Line 2345  void MainWindow::on_saver_error() Line 2352  void MainWindow::on_saver_error()
2352    
2353  void MainWindow::on_saver_finished()  void MainWindow::on_saver_finished()
2354  {  {
2355        saver->join();
2356      this->file = saver->gig;      this->file = saver->gig;
2357      this->filename = saver->filename;      this->filename = saver->filename;
2358      current_gig_dir = Glib::path_get_dirname(filename);      current_gig_dir = Glib::path_get_dirname(filename);

Legend:
Removed from v.3470  
changed lines
  Added in v.3471

  ViewVC Help
Powered by ViewVC