summaryrefslogtreecommitdiff
path: root/emu/MacOSX
diff options
context:
space:
mode:
authorCharles.Forsyth <devnull@localhost>2009-05-17 15:28:42 +0000
committerCharles.Forsyth <devnull@localhost>2009-05-17 15:28:42 +0000
commitaf1b61f55a195350b4491438e8b2c381c4ba34bc (patch)
tree1d21834680a5c02e205d176c32dcf2a6f5db79fb /emu/MacOSX
parent8d8ff66ed15c0d625b78f11a4feeeef6516937be (diff)
20090517-1627
Diffstat (limited to 'emu/MacOSX')
-rw-r--r--emu/MacOSX/win.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/emu/MacOSX/win.c b/emu/MacOSX/win.c
index 41ca8d9d..137ab275 100644
--- a/emu/MacOSX/win.c
+++ b/emu/MacOSX/win.c
@@ -305,7 +305,7 @@ static WindowRef oldWindow = NULL;
static void
leave_full_screen(void)
{
- if (0 && amFullScreen) {
+ if(amFullScreen){
EndFullScreen(fullScreenRestore, 0);
theWindow = oldWindow;
ShowWindow(theWindow);
@@ -321,7 +321,7 @@ leave_full_screen(void)
static void
full_screen(void)
{
- if (0 && !amFullScreen) {
+ if(!amFullScreen){
oldWindow = theWindow;
HideWindow(theWindow);
BeginFullScreen(&fullScreenRestore, 0, 0, 0, &theWindow, 0, 0);
@@ -626,6 +626,8 @@ clipread(void)
int i;
char *s;
+ if(appleclip == NULL)
+ return nil;
// Wow. This is ridiculously complicated.
PasteboardSynchronize(appleclip);
if((err = PasteboardGetItemCount(appleclip, &nitems)) != noErr) {
@@ -681,6 +683,8 @@ clipwrite(char *snarf)
CFDataRef cfdata;
PasteboardSyncFlags flags;
+ if(appleclip == NULL)
+ return 0;
runeseprint(rsnarf, rsnarf+nelem(rsnarf), "%s", snarf);
if(PasteboardClear(appleclip) != noErr){
fprint(2, "apple pasteboard clear failed\n");