sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Revert "monitor-manager: Remove needless code"

Browse source 
It turns out that this was wrong because MetaWindow->monitor points to
the old monitor infos and they are needed to position windows in the
new configuration which happens in a monitors-changed handler.

This reverts commit e1704acda4.
This commit is contained in:
Rui Matos 2014-10-23 16:31:09 +02:00
parent cd1e1d4bf1
commit b63413e5b0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/backends/meta-monitor-manager.c
View file

@ -149,8 +149,6 @@ make_logical_config (MetaMonitorManager *manager)
manager->primary_monitor_index = info->number; manager->primary_monitor_index = info->number;
} }
g_free (manager->monitor_infos);
manager->n_monitor_infos = monitor_infos->len; manager->n_monitor_infos = monitor_infos->len;
manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE); manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
} }
@ -1167,12 +1165,18 @@ meta_monitor_manager_read_current_config (MetaMonitorManager *manager)
void void
meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager) meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
{ {
MetaMonitorInfo *old_monitor_infos;
old_monitor_infos = manager->monitor_infos;
if (manager->in_init) if (manager->in_init)
return; return;
make_logical_config (manager); make_logical_config (manager);
g_signal_emit_by_name (manager, "monitors-changed"); g_signal_emit_by_name (manager, "monitors-changed");
g_free (old_monitor_infos);
} }
void void