Merge fixes

3 files changed, 5 insertions, 5 deletions

diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 9c26018d..efc9fc69 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -27,15 +27,15 @@ typedef struct LinuxProcess_ {
 
 }*/
 
-LinuxProcess* LinuxProcess_new(Settings* settings, ProcessList* pl) {
+LinuxProcess* LinuxProcess_new(ProcessList* pl) {
    LinuxProcess* this = calloc(sizeof(LinuxProcess), 1);
-   Process_init(&this->super, settings, pl);
+   Object_setClass(this, Class(Process));
+   Process_init(&this->super, pl);
    return this;
 }
 
 void LinuxProcess_delete(Object* cast) {
    LinuxProcess* this = (LinuxProcess*) this;
-   Object_setClass(this, Class(Process));
    Process_done((Process*)cast);
    free(this);
 }
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index ec2740e9..a162c5eb 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -20,7 +20,7 @@ typedef struct LinuxProcess_ {
 #define Process_delete LinuxProcess_delete
 
 
-LinuxProcess* LinuxProcess_new(Settings* settings);
+LinuxProcess* LinuxProcess_new(ProcessList* pl);
 
 void LinuxProcess_delete(Object* cast);
 
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 2bce78e5..54d20708 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -465,7 +465,7 @@ static bool LinuxProcessList_processEntries(ProcessList* this, const char* dirna
          process = existingProcess;
          assert(process->pid == pid);
       } else {
-         process = (Process*) LinuxProcess_new(settings, this);
+         process = (Process*) LinuxProcess_new(this);
          assert(process->comm == NULL);
          process->pid = pid;
          process->tgid = parent ? parent->pid : pid;