Changeset 3284 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_update.cc

Timestamp:

Dec 26, 2004, 12:53:21 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/updater: cleaner code

File:

• orxonox/branches/updater/src/gui/orxonox_gui_update.cc (modified) (2 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -288 +288 @@
       if (!isDownloading)
         {
-          isDownloading = true;
+          pthread_join(*downloadThreadFinishID, NULL);
+
+          info->stateButton->disconnectSignal(info->buttonSignal);
+          info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, cancelDownload);
+#ifdef HAVE_PTHREAD_H
+          info->stateButton->setTitle("cancel");
+#else /* HAVE_PTHREAD_H */
+          info->stateButton->setTitle("please wait");
+#endif /* HAVE_PTHREAD_H */
+          
           //! \todo check if threads really were created.
 #ifdef HAVE_PTHREAD_H
-          pthread_join(*downloadThreadFinishID, NULL);
           pthread_create(downloadThreadID, NULL, downloadThread, info);
           pthread_create(downloadThreadFinishID, NULL, downloadThreadFinished, info);  
@@ -318 +326 @@
 void* OrxonoxGuiUpdate::downloadThread(void* fileInfo)
 {
-#ifdef HAVE_PTHREAD_H
-  pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-  gdk_threads_enter();
-#endif /* HAVE_PTHREAD_H */
-  FileInfo* info = (FileInfo*)fileInfo;
-  info->stateButton->disconnectSignal(info->buttonSignal);
-  info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, cancelDownload);
-#ifdef HAVE_PTHREAD_H
-  info->stateButton->setTitle("cancel");
-  gdk_threads_leave();
-#else /* HAVE_PTHREAD_H */
-  info->stateButton->setTitle("please wait");
-#endif /* HAVE_PTHREAD_H */
-  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-
+  isDownloading = true;
   curl_easy_perform(curlHandle);
 }