Permalink
Browse files

Merge branch 'master' into lua-scripting

  • Loading branch information...
2 parents 40c07e7 + 8f53cfa commit 0e4863df561fe6c99ce7d2f69a29b2809a1a00b9 Sadrul Habib Chowdhury committed Aug 22, 2008
Showing with 17 additions and 4 deletions.
  1. +17 −4 src/socket.c
View
@@ -802,6 +802,7 @@ struct win *wi;
switch (m->type)
{
+ case MSG_CONT:
case MSG_ATTACH:
pid = m->m.attach.apid;
user = m->m.attach.auser;
@@ -1245,8 +1246,14 @@ struct msg *m;
ASSERT(display);
pid = D_userpid;
- if (m->m.attach.detachfirst != MSG_ATTACH)
+#ifdef REMOTE_DETACH
+ if (m->m.attach.detachfirst == MSG_DETACH
+# ifdef POW_DETACH
+ || m->m.attach.detachfirst == MSG_POW_DETACH
+# endif
+ )
FinishDetach(m);
+#endif
#if defined(pyr) || defined(xelos) || defined(sequent)
/*
@@ -1507,10 +1514,16 @@ int ilen;
AddStr("\r\n");
D_processinputdata = 0;
D_processinput = ProcessInput;
- if (pwdata->m.type == MSG_ATTACH)
- FinishAttach(&pwdata->m);
- else
+#ifdef REMOTE_DETACH
+ if (pwdata->m.type == MSG_DETACH
+# ifdef POW_DETACH
+ || pwdata->m.type == MSG_POW_DETACH
+# endif
+ )
FinishDetach(&pwdata->m);
+ else
+#endif
+ FinishAttach(&pwdata->m);
free(pwdata);
return;
}

0 comments on commit 0e4863d

Please sign in to comment.