From 3683b4c42003feba4c4181f6681993dc5c8881e4 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Wed, 25 Sep 2013 13:26:28 +0200 Subject: [PATCH] Fix creating new objects (with id == 0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2a6740d5e1a4367d2980e3fb17617c2f1cb95041 Reviewed-by: Andrew Knight Reviewed-by: Jørgen Lind --- src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp index 268747bb586..fcd8ec8294e 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp @@ -622,7 +622,7 @@ void process(QXmlStreamReader &xml) printf(" Resource *resource = %s_allocate();\n", interfaceNameStripped); printf(" resource->%s = this;\n", interfaceNameStripped); printf("\n"); - printf(" struct ::wl_resource *handle = wl_client_add_object(client, &::%s_interface, %s, id, resource);\n", interfaceName, interfaceMember.constData()); + printf(" struct ::wl_resource *handle = id != 0 ? wl_client_add_object(client, &::%s_interface, %s, id, resource) : wl_client_new_object(client, &::%s_interface, %s, resource);\n", interfaceName, interfaceMember.constData(), interfaceName, interfaceMember.constData()); printf("\n"); printf(" handle->destroy = destroy_func;\n"); printf(" resource->handle = handle;\n");