From eadb3ccaf6ce06ecbd41408ddb14983cc4d87ff8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 22 Jan 2015 19:14:05 -0500 Subject: [PATCH] fix operation of Editor::{push,pop}_canvas_cursor() --- gtk2_ardour/editor_canvas.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 416a8ddaef..0e5f6271c6 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1106,8 +1106,8 @@ Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save) void Editor::push_canvas_cursor (Gdk::Cursor* cursor) { - if (!MouseCursors::is_invalid (cursor)) { - _cursor_stack.push (cursor); + if (!MouseCursors::is_invalid (current_canvas_cursor)) { + _cursor_stack.push (current_canvas_cursor); set_canvas_cursor (cursor, false); } } @@ -1116,9 +1116,9 @@ void Editor::pop_canvas_cursor () { if (!_cursor_stack.empty()) { - Gdk::Cursor* cursor = _cursor_stack.top (); - _cursor_stack.pop (); - set_canvas_cursor (cursor, false); + Gdk::Cursor* cursor = _cursor_stack.top (); + _cursor_stack.pop (); + set_canvas_cursor (cursor, false); } }