| vclnsapp.mm (79aad27f) | vclnsapp.mm (c7ada659) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 436 unchanged lines hidden (view full) --- 445// for Apple Remote implementation 446 447#pragma mark - 448#pragma mark NSApplication Delegates 449- (void)applicationWillBecomeActive:(NSNotification *)pNotification 450{ 451 (void)pNotification; 452 SalData* pSalData = GetSalData(); | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 436 unchanged lines hidden (view full) --- 445// for Apple Remote implementation 446 447#pragma mark - 448#pragma mark NSApplication Delegates 449- (void)applicationWillBecomeActive:(NSNotification *)pNotification 450{ 451 (void)pNotification; 452 SalData* pSalData = GetSalData(); |
| 453 if (pSalData->mpMainController->remoteControl) | 453 if( pSalData->mpMainController && pSalData->mpMainController->remoteControl) |
| 454 { 455 // [remoteControl startListening: self]; 456 // does crash because the right thing to do is 457 // [GetSalData()->mpMainController->remoteControl startListening: self]; 458 // but the instance variable 'remoteControl' is declared protected 459 // workaround : declare remoteControl instance variable as public in RemoteMainController.m 460 461 [pSalData->mpMainController->remoteControl startListening: self]; --- 9 unchanged lines hidden (view full) --- 471 [(*it)->mpWindow orderFront: NSApp]; 472 } 473} 474 475- (void)applicationWillResignActive:(NSNotification *)pNotification 476{ 477 (void)pNotification; 478 SalData* pSalData = GetSalData(); | 454 { 455 // [remoteControl startListening: self]; 456 // does crash because the right thing to do is 457 // [GetSalData()->mpMainController->remoteControl startListening: self]; 458 // but the instance variable 'remoteControl' is declared protected 459 // workaround : declare remoteControl instance variable as public in RemoteMainController.m 460 461 [pSalData->mpMainController->remoteControl startListening: self]; --- 9 unchanged lines hidden (view full) --- 471 [(*it)->mpWindow orderFront: NSApp]; 472 } 473} 474 475- (void)applicationWillResignActive:(NSNotification *)pNotification 476{ 477 (void)pNotification; 478 SalData* pSalData = GetSalData(); |
| 479 if (pSalData->mpMainController->remoteControl) | 479 if( pSalData->mpMainController && pSalData->mpMainController->remoteControl) |
| 480 { 481 // [remoteControl stopListening: self]; 482 // does crash because the right thing to do is 483 // [GetSalData()->mpMainController->remoteControl stopListening: self]; 484 // but the instance variable 'remoteControl' is declared protected 485 // workaround : declare remoteControl instance variable as public in RemoteMainController.m 486 487 [pSalData->mpMainController->remoteControl stopListening: self]; --- 31 unchanged lines hidden --- | 480 { 481 // [remoteControl stopListening: self]; 482 // does crash because the right thing to do is 483 // [GetSalData()->mpMainController->remoteControl stopListening: self]; 484 // but the instance variable 'remoteControl' is declared protected 485 // workaround : declare remoteControl instance variable as public in RemoteMainController.m 486 487 [pSalData->mpMainController->remoteControl stopListening: self]; --- 31 unchanged lines hidden --- |