- if (newcause==CAUSE_NOUSER && *multicause==CAUSE_NOUSER) /* cause 18, but no cause yet, use the location */
- {
+ if (newcause==CAUSE_NOUSER && *multicause==CAUSE_NOUSER) { /* cause 18, use the location */
+ *multilocation = newlocation;
+ } else
+ if (*multicause==0) { /* no cause yet, use newcause (should be 18) */
+ *multicause = newcause;