mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-02-14 11:53:26 +01:00
Merge pull request #1270 from ychin/fix-settitle-crash-appearance-changed
Fix potential crash in setTitle
This commit is contained in:
@@ -245,11 +245,13 @@
|
||||
ASLogDebug(@"");
|
||||
|
||||
[decoratedWindow release]; decoratedWindow = nil;
|
||||
[fullScreenWindow release]; fullScreenWindow = nil;
|
||||
[windowAutosaveKey release]; windowAutosaveKey = nil;
|
||||
[vimView release]; vimView = nil;
|
||||
[toolbar release]; toolbar = nil;
|
||||
// in case processAfterWindowPresentedQueue wasn't called
|
||||
[afterWindowPresentedQueue release]; afterWindowPresentedQueue = nil;
|
||||
[lastSetTitle release]; lastSetTitle = nil;
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
@@ -461,8 +463,9 @@
|
||||
- (void)setTitle:(NSString *)title
|
||||
{
|
||||
// Save the original title, if we haven't already.
|
||||
[title retain]; // retain the title first before release lastSetTitle, since you can call setTitle on lastSetTitle itself.
|
||||
[lastSetTitle release];
|
||||
lastSetTitle = [title retain];
|
||||
lastSetTitle = title;
|
||||
|
||||
// While in live resize the window title displays the dimensions of the
|
||||
// window so don't clobber this with the new title. We have already set
|
||||
@@ -934,10 +937,6 @@
|
||||
// Enter custom full-screen mode.
|
||||
ASLogInfo(@"Enter custom full-screen");
|
||||
|
||||
// fullScreenWindow could be non-nil here if this is called multiple
|
||||
// times during startup.
|
||||
[fullScreenWindow release];
|
||||
|
||||
NSColor *fullscreenBg = back;
|
||||
|
||||
// See setDefaultColorsBackground: for why set a transparent
|
||||
@@ -946,6 +945,10 @@
|
||||
fullscreenBg = [fullscreenBg colorWithAlphaComponent:0.001];
|
||||
}
|
||||
|
||||
// fullScreenWindow could be non-nil here if this is called multiple
|
||||
// times during startup.
|
||||
[fullScreenWindow release];
|
||||
|
||||
fullScreenWindow = [[MMFullScreenWindow alloc]
|
||||
initWithWindow:decoratedWindow view:vimView backgroundColor:fullscreenBg];
|
||||
[fullScreenWindow setOptions:fuoptions];
|
||||
|
||||
Reference in New Issue
Block a user