[QT] fix OSX dock icon window reopening #5880

pull jonasschnelli wants to merge 2 commits into bitcoin:master from jonasschnelli:2015/03/fix_osx_close_reopen changing 3 files +31 −41

jonasschnelli commented at 11:15 PM on March 11, 2015: contributor

fixes #5878. Tested on OSX 10.10.

Needs testing on OSX 10.7 till 10.9.
[QT] fix OSX dock icon window reopening
fixes #5878
89e70e931d
jonasschnelli force-pushed on Mar 11, 2015
jonasschnelli commented at 11:48 PM on March 11, 2015: contributor

Binaries to test: https://builds.jonasschnelli.ch/pulls/5880/
jonasschnelli commented at 7:29 AM on March 12, 2015: contributor

Tested https://builds.jonasschnelli.ch/pulls/5880/bitcoin-0.10.99-osx-unsigned.dmg on 10.7 and 10.9. Works fine there. Assume 10.8 will also work.
in src/qt/macdockiconhandler.mm:None in 89e70e931d outdated
```
  24 | -}
  25 | -
  26 | -@end
  27 | -
  28 | -@implementation DockIconClickEventHandler
  29 | +static MacDockIconHandler *s_instance = NULL;
```
laanwj commented at 9:45 AM on March 12, 2015:

Does s_instance ever get freed?

jonasschnelli commented at 9:54 AM on March 12, 2015:

No. It's a singleton pattern and i assume the OS will care about the cleanup. But i could try to proactive free it within the destructor of ~MacDockIconHandler. But this might be more or less the same cleanup as the os does.

laanwj commented at 7:41 AM on March 13, 2015:

I'd prefer if it was freed. Otherwise it will show up as a memory leak. Would be even better to do it without introducing a singleton, but I suppose that isn't possible.
fanquake commented at 1:31 PM on March 12, 2015: member

Tested ACK
laanwj added the label Mac on Mar 13, 2015
laanwj added the label GUI on Mar 13, 2015
laanwj commented at 7:42 AM on March 13, 2015: member

@fanquake on what version of OSX?
fanquake commented at 9:46 AM on March 13, 2015: member

@laanwj 10.9 & 10.10
[QT] some mac specifiy cleanup (memory handling, unnecessary code) 8b60808c1e
jonasschnelli commented at 3:21 PM on March 13, 2015: contributor

Updated with @laanwj nits (mem cleanup). Also removed unused code. @fanquake mind retesting? Binaries: https://builds.jonasschnelli.ch/pulls/5880/
jonasschnelli commented at 3:24 PM on March 13, 2015: contributor

Retested on 10.7 and 10.9. Works fine there.
fanquake commented at 4:57 AM on March 14, 2015: member

ReACK Checked 10.9 & 10.10
laanwj merged this on Mar 16, 2015
laanwj closed this on Mar 16, 2015
laanwj referenced this in commit 226f880498 on Mar 16, 2015
laanwj commented at 12:57 PM on March 16, 2015: member

Cherry-picked to 0.10 as 81145a6 and 2c08406
laanwj referenced this in commit 81145a6ccd on Mar 17, 2015
laanwj referenced this in commit 2c0840631d on Mar 17, 2015
reddink referenced this in commit bb0e7f9782 on May 27, 2020
reddink referenced this in commit ad2d6ca0ee on May 27, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#5878 Closed window doesn't show when clicking dock icon