From 16425817f62b150799ddec75bb487677970f35ed Mon Sep 17 00:00:00 2001
From: Eknous-P <ehovakimyan053@gmail.com>
Date: Thu, 16 Nov 2023 14:13:45 +0400
Subject: [PATCH] some rearranging, undo table column bump and default to true
 for older verions

---
 src/engine/fileOps.cpp | 2 ++
 src/engine/song.h      | 2 +-
 src/gui/channels.cpp   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp
index 5db45e335..b8b6978ca 100644
--- a/src/engine/fileOps.cpp
+++ b/src/engine/fileOps.cpp
@@ -2184,6 +2184,7 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
       for (int i=0; i<tchans; i++) {
         if (ds.version<189) {
           subSong->chanShow[i]=reader.readC();
+            subSong->chanShowChanOsc[i]=true;
         } else { // stores 2 bools in a single char for better compat?
           unsigned char tempchar=reader.readC();
           subSong->chanShow[i]=tempchar&0xf;
@@ -2588,6 +2589,7 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
         for (int i=0; i<tchans; i++) {
           if (ds.version<189) {
             subSong->chanShow[i]=reader.readC();
+            subSong->chanShowChanOsc[i]=true;
           } else {
             unsigned char tempchar=reader.readC();
             subSong->chanShow[i]=tempchar&0xf;
diff --git a/src/engine/song.h b/src/engine/song.h
index e4dee0f7a..45d2b64be 100644
--- a/src/engine/song.h
+++ b/src/engine/song.h
@@ -184,8 +184,8 @@ struct DivSubSong {
     patLen(64),
     ordersLen(1) {
     for (int i=0; i<DIV_MAX_CHANS; i++) {
-      chanShowChanOsc[i]=true;
       chanShow[i]=true;
+      chanShowChanOsc[i]=true;
       chanCollapse[i]=0;
     }
   }
diff --git a/src/gui/channels.cpp b/src/gui/channels.cpp
index f3e79fddc..4b30ad5be 100644
--- a/src/gui/channels.cpp
+++ b/src/gui/channels.cpp
@@ -38,7 +38,7 @@ void FurnaceGUI::drawChannels() {
     //ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH));
   }
   if (ImGui::Begin("Channels",&channelsOpen,globalWinFlags)) {
-    if (ImGui::BeginTable("ChannelList",4)) {
+    if (ImGui::BeginTable("ChannelList",3)) {
       ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,0.0);
       ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.0);
       ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed,48.0f*dpiScale);