[xorg-commit-diffs] xc/programs/Xserver/hw/xwin InitOutput.c, 1.1.4.1.2.29, 1.1.4.1.2.30 winglobals.c, 1.1.2.13, 1.1.2.14

[Harold L Hunt II]

Committed by: harold


Index: InitOutput.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/InitOutput.c,v
retrieving revision 1.1.4.1.2.29
retrieving revision 1.1.4.1.2.30
diff -u -d -r1.1.4.1.2.29 -r1.1.4.1.2.30
--- a/InitOutput.c	29 Mar 2004 15:45:52 -0000	1.1.4.1.2.29
+++ b/InitOutput.c	29 Mar 2004 16:32:37 -0000	1.1.4.1.2.30
@@ -136,12 +136,24 @@
     {
       /* Synchronously destroy the clipboard window */
       if (g_hwndClipboard != NULL)
-	SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
+	{
+	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
+	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
+	}
       else
 	return;
       
       /* Wait for the clipboard thread to exit */
-      pthread_join (g_ptClipboardProc, NULL);
+      if (g_ptClipboardProc)
+	{
+	  pthread_join (g_ptClipboardProc, NULL);
+	  g_ptClipboardProc = 0;
+	}
+      else
+	return;
+
+      g_fClipboardLaunched = FALSE;
+      g_fClipboardStarted = FALSE;
 
       ErrorF ("ddxBeforeReset - Clipboard thread has exited.\n");
     }
@@ -181,7 +193,7 @@
   for (i = 0; i < g_iNumScreens; ++i)
     {
       /* Delete the tray icon */
-      if (!g_ScreenInfo[i].fNoTrayIcon)
+      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)
  	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));
     }
 

Index: winglobals.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winglobals.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- a/winglobals.c	26 Mar 2004 03:21:41 -0000	1.1.2.13
+++ b/winglobals.c	29 Mar 2004 16:32:37 -0000	1.1.2.14
@@ -94,11 +94,11 @@
 Bool			g_fClipboard = FALSE;
 Bool			g_fClipboardLaunched = FALSE;
 Bool			g_fClipboardStarted = FALSE;
-pthread_t		g_ptClipboardProc;
-HWND			g_hwndClipboard;
-void			*g_pClipboardDisplay;
-Window			g_iClipboardWindow;
-Atom			g_atomLastOwnedSelection;
+pthread_t		g_ptClipboardProc = 0;
+HWND			g_hwndClipboard = NULL;
+void			*g_pClipboardDisplay = NULL;
+Window			g_iClipboardWindow = None;
+Atom			g_atomLastOwnedSelection = None;
 #endif
 
 
@@ -120,5 +120,6 @@
   g_pClipboardDisplay = NULL;
   g_atomLastOwnedSelection = None;
   g_hwndClipboard = NULL;
+  g_ptClipboardProc = 0;
 #endif
 }