Revert previous. Causes a crash as reported by Tom Murphy.
This commit is contained in:
parent
99b5f48359
commit
5376c8c363
@ -15,7 +15,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
* $OpenBSD: client.c,v 1.259 2020/03/13 20:49:13 tim Exp $
|
||||
* $OpenBSD: client.c,v 1.260 2020/03/14 16:11:09 tim Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -668,23 +668,21 @@ void
|
||||
client_set_name(struct client_ctx *cc)
|
||||
{
|
||||
struct winname *wn;
|
||||
char *newname;
|
||||
int i = 0;
|
||||
|
||||
free(cc->name);
|
||||
if (!xu_get_strprop(cc->win, ewmh[_NET_WM_NAME], &cc->name))
|
||||
if (!xu_get_strprop(cc->win, XA_WM_NAME, &cc->name))
|
||||
cc->name = xstrdup("");
|
||||
if (!xu_get_strprop(cc->win, ewmh[_NET_WM_NAME], &newname))
|
||||
if (!xu_get_strprop(cc->win, XA_WM_NAME, &newname))
|
||||
newname = xstrdup("");
|
||||
|
||||
TAILQ_FOREACH(wn, &cc->nameq, entry) {
|
||||
if (strcmp(wn->name, cc->name) == 0) {
|
||||
if (strcmp(wn->name, newname) == 0)
|
||||
TAILQ_REMOVE(&cc->nameq, wn, entry);
|
||||
free(wn->name);
|
||||
free(wn);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
cc->name = newname;
|
||||
wn = xmalloc(sizeof(*wn));
|
||||
wn->name = xstrdup(cc->name);
|
||||
wn->name = xstrdup(newname);
|
||||
TAILQ_INSERT_TAIL(&cc->nameq, wn, entry);
|
||||
|
||||
/* Garbage collection. */
|
||||
|
Loading…
Reference in New Issue
Block a user