Merge remote-tracking branch 'refs/remotes/origin/master'

kmatheussen · Mar 16, 2024 · 332edc8 · 332edc8
2 parents 3c6f045 + 6ad320a
commit 332edc8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Qt/Qt_Main.cpp b/Qt/Qt_Main.cpp
@@ -3084,7 +3084,7 @@ bool Control2Pressed(void){
 }
 */
 
-Qt::KeyboardModifier HorizontalModifier() {
+static Qt::KeyboardModifier HorizontalModifier() {
   if (SETTINGS_read_bool("alt_as_horizonal_scroll_modifier", false))
     return Qt::AltModifier;
   else

diff --git a/api/api_navigate.cpp b/api/api_navigate.cpp
@@ -375,7 +375,7 @@ void selectPrevPlaylistBlock(void){
 }
 
 void selectTrack(int tracknum,int windownum){
-	setCurrentTrack(tracknum, -2, windownum, false);
+  setCurrentTrack(tracknum, -2, windownum, true);
 }
 
 void setCurrentTrack(int tracknum, int subtrack, int windownum, bool switch_instrument_even_if_locked){

diff --git a/api/protos.conf b/api/protos.conf
@@ -97,7 +97,7 @@ selectTrack 		| int tracknum | int windownum ? -1
 # Swing: -2
 # Tempo automation: -1
 # 
-setCurrentTrack | int tracknum | int subtrack ? -2 | int windownum ? -1 | bool switch_instrument_even_if_locked ? false # subtrack==-2 means try to use same subtrack as for the current track. Also note that the notetext subtrack is always -1. The swing subtracks numbers are always 0,1,2 (even though swing is to the left of the note).
+setCurrentTrack | int tracknum | int subtrack ? -2 | int windownum ? -1 | bool switch_instrument_even_if_locked ? true # subtrack==-2 means try to use same subtrack as for the current track. Also note that the notetext subtrack is always -1. The swing subtracks numbers are always 0,1,2 (even though swing is to the left of the note).
 int getCurrentTrack | int windownum ? -1
 int getCurrentSubtrack | int windownum ? -1
 int getNumSubtracks | int tracknum ? -1 | int blocknum ? -1 | int windownum ? -1 # returns the number of possible horizontal cursor positions.

diff --git a/common/wblocks.c b/common/wblocks.c
@@ -506,7 +506,7 @@ void SelectWBlock(struct Tracker_Windows *window,struct WBlocks *wblock, bool fo
       ATOMIC_WRITE(window->curr_track, newcurrtrack);
 
       if (window->wblock==wblock)
-	      setCurrentTrack(newcurrtrack, newcurrtracksub, window->l.num, false);
+        setCurrentTrack(newcurrtrack, newcurrtracksub, window->l.num, false);
 
       //if (SetCursorPosConcrete(window,wblock,newcurrtrack,newcurrtracksub)==false)
       //  ATOMIC_WRITE(window->curr_track, 0);
@@ -525,9 +525,9 @@ void SelectWBlock(struct Tracker_Windows *window,struct WBlocks *wblock, bool fo
 
       BS_SelectBlock(wblock->block);
 
-      if(false==is_playing() && false==PlayerIsCurrentlyPlayingLoop()){
+      if (!isPlayingSong()){
         R_ASSERT_RETURN_IF_FALSE(wblock->wtrack->track != NULL);
-        GFX_update_instrument_patch_gui(wblock->wtrack->track->patch, false);
+        GFX_update_instrument_patch_gui(wblock->wtrack->track->patch, true);
       }
 
       //window->must_redraw = false;