Fixed events

2 files changed, 2 insertions, 5 deletions

diff --git a/kernel/features/load.c b/kernel/features/load.c
index 1f1c898..8aa28b8 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -18,7 +18,6 @@ int bin_load(char *path, struct proc *proc)
 	u32 stack = (u32)malloc(0x2000) + 0x1000;
 
 	proc->regs.ebp = (u32)stack;
-	proc->regs.esp = (u32)stack;
 	proc->regs.useresp = (u32)stack;
 	proc->regs.eip = (u32)data;
 	strcpy(proc->name, path + 1);
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 4d4a9f3..d1a2780 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -72,6 +72,7 @@ void scheduler(struct regs *regs)
 		quantum = PROC_QUANTUM;
 		proc->state = PROC_IN_EVENT;
 		list_remove(proc->events, proc->events->head);
+		regs->useresp += 4;
 		((u32 *)regs->useresp)[1] = (u32)proc_event->data; // Huh
 	}
 
@@ -93,10 +94,7 @@ void proc_print()
 
 struct proc *proc_current()
 {
-	if (current)
-		return current->data;
-	else
-		return NULL;
+	return current ? current->data : NULL;
 }
 
 void proc_send(struct proc *src, struct proc *dest, enum message_type type, void *data)