Merge branch 'number-cpus-from-zero' of zevweiss/htop

* This changes the default to count CPUs from zero (instead of starting at one)
* Settings logic is inverted, backwards compatibility is preserved

1 files changed, 2 insertions, 2 deletions

diff --git a/Settings.h b/Settings.h
index 4eece3b0..bbd40e16 100644
--- a/Settings.h
+++ b/Settings.h
@@ -34,7 +34,7 @@ typedef struct Settings_ {
    int direction;
    ProcessField sortKey;
 
-   bool countCPUsFromZero;
+   bool countCPUsFromOne;
    bool detailedCPUTime;
    bool showCPUUsage;
    bool showCPUFrequency;
@@ -59,7 +59,7 @@ typedef struct Settings_ {
    bool changed;
 } Settings;
 
-#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromZero ? (cpu) : (cpu)+1)
+#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromOne ? (cpu)+1 : (cpu))
 
 void Settings_delete(Settings* this);