Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #912 from Elv13/fix_tag_delete_race 

tag: Avoid a race condition when deleting tags.
This commit is contained in:
Emmanuel Lepage Vallée 2016-05-18 16:01:30 -04:00
parent c1d3f291fe 6e6c4c3a5d
commit 3fd292e1ff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/awful/tag.lua
View File

@ -295,7 +295,6 @@ function tag.object.delete(self, fallback_tag, force)
-- delete the tag -- delete the tag
data.tags[self].screen = nil data.tags[self].screen = nil
data.tags[self] = nil
self.activated = false self.activated = false
-- Update all indexes -- Update all indexes
@ -1387,7 +1386,10 @@ capi.screen.connect_signal("removed", function(s)
-- If any tag survived until now, forcefully get rid of it -- If any tag survived until now, forcefully get rid of it
for _, t in pairs(s.tags) do for _, t in pairs(s.tags) do
t.activated = false t.activated = false
data.tags[t] = nil
if data.tags[t] then
data.tags[t].screen = nil
end
end end
end) end)