settings is never null anymore, so dont bother to check. also use else's because we don't need to set match=false 3 times
This commit is contained in:
parent
2867aba1ae
commit
a6903d9056
1 changed files with 40 additions and 40 deletions
|
@ -735,11 +735,13 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
|
|||
if (app->name &&
|
||||
!g_pattern_match(app->name, strlen(self->name), self->name, NULL))
|
||||
match = FALSE;
|
||||
if (app->class &&
|
||||
!g_pattern_match(app->class, strlen(self->class),self->class,NULL))
|
||||
else if (app->class &&
|
||||
!g_pattern_match(app->class,
|
||||
strlen(self->class), self->class, NULL))
|
||||
match = FALSE;
|
||||
if (app->role &&
|
||||
!g_pattern_match(app->role, strlen(self->role), self->role, NULL))
|
||||
else if (app->role &&
|
||||
!g_pattern_match(app->role,
|
||||
strlen(self->role), self->role, NULL))
|
||||
match = FALSE;
|
||||
|
||||
if (match) {
|
||||
|
@ -751,7 +753,6 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
|
|||
}
|
||||
}
|
||||
|
||||
if (settings) {
|
||||
if (settings->shade != -1)
|
||||
self->shaded = !!settings->shade;
|
||||
if (settings->decor != -1)
|
||||
|
@ -791,7 +792,6 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
|
|||
self->below = FALSE;
|
||||
self->above = TRUE;
|
||||
}
|
||||
}
|
||||
return settings;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue