diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2025-09-09 10:03:09 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2025-09-29 10:18:27 +0300 |
| commit | 981802ad7bedd8f5ff29bfaa8460989291315048 (patch) | |
| tree | 4b66eb82b88439fa1db65d2ec9cfcaea2206ee28 | |
| parent | 5f2022678d67d6c80c0b50c8c2e9b2246a053159 (diff) | |
| download | tdebase-981802ad.tar.gz tdebase-981802ad.zip | |
Remove copypaste artifacts "i=" from main_low_apply() calls
This fixes a crash in tderandrtray on display reconnect, noticed during
debugging TDE/tdelibs/376.
Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/376
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit e07d4c99b1c96bddf56f76bf78f6d859bdb41cda)
| -rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 1cab60e82..a06cfba3b 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -195,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration() if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { continue; } - + // Activate this output randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); - + main_low_apply(randr_screen_info); + if (randr_screen_info->outputs[i]->cur_crtc) { // Output successfully activated! set_primary_output(randr_screen_info, randr_screen_info->cur_output->id); @@ -879,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); if (!randr_screen_info->outputs[parameter]->cur_crtc) { output_name = randr_screen_info->outputs[parameter]->info->name; @@ -894,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 0; randr_screen_info->cur_output->off_set = 1; output_off(randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); findPrimaryDisplay(); refresh(); |