@@ -30,9 +30,6 @@ - (IBAction) mergeAction:sender { int part = 2; int rate = 5; - if( [imageView1 clear] || [imageView2 clear] ) { - return; - } NSImage* image1 = [imageView1 image]; NSImage* image2 = [imageView2 image]; NSSize size1 = [image1 size]; @@ -72,6 +69,7 @@ - (void)setLastOpenedImage:(id)sender { self.lastOpenedImageView = [sender object]; + [self mergeAction:sender]; } - (IBAction) saveAction:sender { NSMainMenuController.m c61173b11c6d7ff7f2f9173c7f427762b95e73f2 Dr Nic Williams drnicwilliams@gmail.com http://github.com/mocra/iconmerge/commit/ec480d8b912f98463894d6152ee03af06731c6de ec480d8b912f98463894d6152ee03af06731c6de 2009-02-16T01:37:25-08:00 2009-02-16T01:37:25-08:00 fixed the bug where merged image wasn't generated after dropping a9f7435746adf9e027c6e5909b571fe7058416eb Dr Nic Williams drnicwilliams@gmail.com