Commit 98bfa4f1 authored by Jan Djärv's avatar Jan Djärv
Browse files

Fix use of deallocated memory.

* nsterm.h (EmacsScroller): Remove dealloc.

* nsterm.m (judge): EmacsScroller: Move dealloc code here.
(dealloc): Remove for EmacsScroller.
parent 0224bf74
2014-06-30 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (judge): EmacsScroller: Move dealloc code here.
(dealloc): Remove for EmacsScroller.
* nsterm.h (EmacsScroller): Remove dealloc.
2014-06-30 Eli Zaretskii <eliz@gnu.org>
* coding.c (MIN_CHARBUF_SIZE): Enlarge to 32. (Bug#17881)
......
......@@ -412,7 +412,6 @@ typedef float EmacsCGFloat;
- initFrame: (NSRect )r window: (Lisp_Object)win;
- (void)setFrame: (NSRect)r;
- (void)dealloc;
- setPosition: (int) position portion: (int) portion whole: (int) whole;
- (int) checkSamePosition: (int)position portion: (int)portion
......
......@@ -7144,15 +7144,6 @@ - (void)setFrame: (NSRect)newRect
}
- (void)dealloc
{
NSTRACE (EmacsScroller_dealloc);
if (!NILP (win))
wset_vertical_scroll_bar (XWINDOW (win), Qnil);
[super dealloc];
}
- condemn
{
NSTRACE (condemn);
......@@ -7180,6 +7171,9 @@ - (void)dealloc
view = (EmacsView *)FRAME_NS_VIEW (frame);
if (view != nil)
view->scrollbarsNeedingUpdate++;
if (!NILP (win))
wset_vertical_scroll_bar (XWINDOW (win), Qnil);
win = Qnil;
[self removeFromSuperview];
[self release];
unblock_input ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment