From 63e1417b8c0689ab32b0a451fc39de1711e17ceb Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Fri, 6 Apr 2018 12:34:57 -0300
Subject: [PATCH] Update some field accesses to new structures

---
 Action.c             | 2 +-
 htop.c               | 2 +-
 linux/LinuxProcess.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Action.c b/Action.c
index f7d7d4da..2483d451 100644
--- a/Action.c
+++ b/Action.c
@@ -280,7 +280,7 @@ static Htop_Reaction actionExpandOrCollapse(State* st) {
 }
 
 static Htop_Reaction actionCollapseIntoParent(State* st) {
-   if (!st->settings->treeView) {
+   if (!st->settings->ss->treeView) {
       return HTOP_OK;
    }
    bool changed = collapseIntoParent(st->panel);
diff --git a/htop.c b/htop.c
index be01e14c..875cf6e8 100644
--- a/htop.c
+++ b/htop.c
@@ -205,7 +205,7 @@ int main(int argc, char** argv) {
    if (!flags.useColors) 
       settings->colorScheme = COLORSCHEME_MONOCHROME;
    if (flags.treeView)
-      settings->treeView = true;
+      settings->screens[0]->treeView = true;
 
    CRT_init(settings->delay, settings->colorScheme);
    
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index b2c4838f..4ccba3fe 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -186,7 +186,7 @@ typedef struct LinuxProcess_ {
 } LinuxProcess;
 
 #ifndef Process_isKernelThread
-#define Process_isKernelThread(_process) ((LinuxProcess*)(_process)->isKernelThread)
+#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread)
 #endif
 
 #ifndef Process_isUserlandThread