# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: benjamin.tissoires@gmail.com-20121119142907-\ # rm0boptk9e6ddkm6 # target_branch: http://bazaar.launchpad.net/~oif-team/evemu/trunk/ # testament_sha1: 631a7464df743d77367d91afccd980f717babb3d # timestamp: 2012-11-19 15:30:32 +0100 # base_revision_id: stephen.webb@canonical.com-20121018145215-\ # x9vo47vz6b2945x8 # # Begin patch === modified file 'tools/evemu-record.c' --- tools/evemu-record.c 2012-03-23 15:38:02 +0000 +++ tools/evemu-record.c 2012-11-19 14:29:07 +0000 @@ -53,8 +53,10 @@ static void handler (int sig __attribute__((unused))) { fflush(output); - if (output != stdout) + if (output != stdout) { fclose(output); + output = NULL; + } } int main(int argc, char *argv[]) @@ -96,7 +98,7 @@ fprintf(stderr, "error: could not describe device\n"); } close(fd); - if (output != stdout) + if (output && output != stdout) fclose(output); return 0; } # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWenhEPMAAXDfgAAwcWP//1IF BgC//9/6UANte95rzxo4OvcJJIJphMgngImZTaTTUZMjTymnoMqbSajwNJMo9TyQGgAGgAaDIptT ZSn6Iyg2o2oaaAAAaDQMlGofqjanpqMTRoAAAAAAkimKZop5U3tTRoU9qhoMR6jEYJgyZppil1n/ 7um+OVRTXIVZnTCIa3oH3Pjrf6n+h4S3MzAe/mBTciuLK1WpkF0p1DY+uxfLX7bfSV66vX6kdtBw VC22zA32GrXVTKOYVEQR+bdREkz3z/guFXcp3q12SM6Rje9e/lGkgNbO/wEMGL6JdEWIh5ZC4GMJ okxhTLegxtMglGR7AViJpU6wItBGMlncG+TzmBcYAvualVZIU21PQgApsoGXXtwSb9oIeCJGmaBw Ut0g5lXALjUI7mWTRELkq2Wsxvxt4NV4TSZoKoSx0kLgxO2zrVpHWxQpfiQVTjKwqbAMwaEOq/NQ XEsfZAIYTsgXCrRonlRp3HMWgxyhPeBio1XCWx4c4RdWXLGS4QpQcuInaA0dhsDhqE1g8jXyLasl zjRi9o4QZ4TGY56Pv3peiphm3tCTkoZSk0kGAcBHT509BvcwqtomecYcduAcUoSVhj53PT9qDrPR CiPo8MF9htafE8ucfAa+XkFKUoc6PoDTDAEciIlNywxXk7UFGkNpuGv65hO57xMTSZYDiPNKaDGw OwOPW5+pqEh95DcjdycUXUwEXiRjAsjadYqDo1jAHhLvHwPbc1vx0FrxwgpaV0cQPce4bA2S6Ia5 2vtrrnztn/jjuidGWSVA+mU4W1O0XQAXWGRjvIAiUEJu1mysu8Z9xEZemDF7FA6JFvFLeVBDwrCN HgRUyAze/dNB9F5glQIHPvA/wc3PD1ypGIfED5B7WpW3S6qAZkhawxFbiG9LaEwm4VBDDp1JpddQ jcLaJ9EqlXlMcCkngXIiNB0nB9GN0ohUwwcJAQCDoZky2Zq2vEDjNbQVYXZhmrD7CcJBctKlZuXN xNHybJmTkqBZvjAU0ZSVQXsGwIIoBq4UD5TBc2VUaQCZFCWxV7DEXUAVzhAAhgAkHZNBYsGLmIfm D+BMGaLBdYV6sM7TkliL8dLWhea5CKhsTgSJQ5XtIjAF+YiIoBpPI2QFfDHwNBValwVEJVjDJ4/Y u5IpwoSHTwiHmA==