Don't try to merge a monitor into NULL

This commit is contained in:
Bastien Dejean 2015-04-26 14:37:30 +02:00
parent 803392e985
commit f3ca2aac29

View file

@ -189,6 +189,10 @@ void remove_monitor(monitor_t *m)
void merge_monitors(monitor_t *ms, monitor_t *md)
{
if (ms == NULL || md == NULL || ms == md) {
return;
}
PRINTF("merge %s into %s\n", ms->name, md->name);
desktop_t *d = ms->desk_head;