Revert "fix commit 169a3d88, restoring the parameter is good, asserting it not"

This reverts commit 80f8a7b9f40ed48adbd5277b1f58e1651700b56c.
This commit is contained in:
Luboš Luňák 2011-09-29 16:19:47 +02:00
parent ede01e1702
commit 87a7c0f851

View file

@ -388,9 +388,9 @@ static NET::WindowType comboToType(int val)
void RulesWidget::setRules(Rules* rules)
{
const bool readFromNewEmptyRules = !rules;
if (readFromNewEmptyRules)
rules = new Rules;
Rules tmp;
Q_ASSERT( rules );
description->setText(rules->description);
wmclass->setText(rules->wmclass);
@ -451,11 +451,6 @@ void RulesWidget::setRules(Rules* rules)
CHECKBOX_FORCE_RULE(strictgeometry,);
CHECKBOX_FORCE_RULE(disableglobalshortcuts,);
CHECKBOX_FORCE_RULE(blockcompositing,);
if (readFromNewEmptyRules) {
delete rules;
rules = NULL; // it's the function parameter...
}
}
#undef GENERIC_RULE