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

Timestamp:

Dec 26, 2004, 12:24:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: now also works, if no pthread is found, but gthread is.

File:

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

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

@@ -318 +318 @@
 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);
@@ -325 +327 @@
 #ifdef HAVE_PTHREAD_H
   info->stateButton->setTitle("cancel");
+  gdk_threads_leave();
 #else /* HAVE_PTHREAD_H */
   info->stateButton->setTitle("please wait");
 #endif /* HAVE_PTHREAD_H */
-  gdk_threads_leave();
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 
@@ -343 +345 @@
 #ifdef HAVE_PTHREAD_H
   pthread_join (*downloadThreadID, NULL);
-#endif /* HAVE_PTHREAD_H */
   gdk_threads_enter();
+#endif /* HAVE_PTHREAD_H */
   if (curlHandle)
     curl_easy_cleanup(curlHandle);
@@ -358 +360 @@
   info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, updateDataFunc);
   isDownloading = false;
+#ifdef HAVE_PTHREAD_H
   gdk_threads_leave();
+#endif /* HAVE_PTHREAD_H */
 
 }