From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 25 May 2020 18:20:41 +0000 (+0200)
Subject: Merge commit '4616fea08c641887b841bffa3a974dae63b4c7e7' into garux-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7763cb7e0d7f6c16cc45335f344385fa6f73ac5;p=xonotic%2Fnetradiant.git

Merge commit '4616fea08c641887b841bffa3a974dae63b4c7e7' into garux-merge
---

d7763cb7e0d7f6c16cc45335f344385fa6f73ac5
diff --cc radiant/camwindow.cpp
index 6fab7dc9,37bcaba3..804d6461
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@@ -793,16 -799,16 +793,16 @@@ void Camera_setAngles( CamWnd& camwnd, 
  // =============================================================================
  // CamWnd class
  
 -gboolean enable_freelook_button_press( GtkWidget* widget, GdkEventButton* event, CamWnd* camwnd ){
 +gboolean enable_freelook_button_press( ui::Widget widget, GdkEventButton* event, CamWnd* camwnd ){
- 	if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) {
+ 	if ( event->type == GDK_BUTTON_PRESS && event->button == 3 && modifiers_for_state( event->state ) == c_modifierNone ) {
  		camwnd->EnableFreeMove();
  		return TRUE;
  	}
  	return FALSE;
  }
  
 -gboolean disable_freelook_button_press( GtkWidget* widget, GdkEventButton* event, CamWnd* camwnd ){
 +gboolean disable_freelook_button_press( ui::Widget widget, GdkEventButton* event, CamWnd* camwnd ){
- 	if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) {
+ 	if ( event->type == GDK_BUTTON_PRESS && event->button == 3 && modifiers_for_state( event->state ) == c_modifierNone ) {
  		camwnd->DisableFreeMove();
  		return TRUE;
  	}