Freeing main argv is not needed and must not be done.

[apps/camera-gstreamer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index 182489e..d84ca26 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -158,7 +158,7 @@ get_next_buffer(struct window *window)
         * the 'old' one and force creation of the buffer with the newer
         * dimensions */
        if (window->wait_for_configure && window->maximized) {
-               if (!window->buffers[0].busy) {
+               if (!window->buffers[0].busy && window->buffers[0].buffer) {
                        wl_buffer_destroy(window->buffers[0].buffer);
                        window->buffers[0].buffer = NULL;
                        window->wait_for_configure = false;
@@ -677,7 +677,7 @@ int main(int argc, char *argv[])
        GstElement *pipeline = gst_parse_launch(pipeline_str, &error);
        if (error || !pipeline) {
                fprintf(stderr, "gstreamer pipeline construction failed!\n");
-               free(argv);
+               free(gargv);
                return EXIT_FAILURE;
        }
 
@@ -700,7 +700,7 @@ int main(int argc, char *argv[])
        window = create_window(display, WINDOW_WIDTH_SIZE, WINDOW_HEIGHT_SIZE, app_id); 
 
        if (!window) {
-               free(argv);
+               free(gargv);
                return EXIT_FAILURE;
        }
 
@@ -731,7 +731,7 @@ int main(int argc, char *argv[])
 
        destroy_window(window);
        destroy_display(display);
-       free(argv);
+       free(gargv);
 
        gst_element_set_state(pipeline, GST_STATE_NULL);
        gst_object_unref(pipeline);