valentineus/0xFFFF
1
Fork 0
Code Releases Activity

main: Fix loading images

Browse Source
This commit is contained in:
Pali Rohár committed 2012-09-23 16:48:24 +02:00
1 parent cd9b51ad80
commit e4f7cf7bc5
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+2 -2
View File
@@ -980,7 +980,7 @@ int main(int argc, char **argv) {
if ( have_kernel == 0 ) { if ( have_kernel == 0 ) {
image_kernel = image_ptr->image; image_kernel = image_ptr->image;
have_kernel = 1; have_kernel = 1;
} else if ( have_kernel == 1 ) { } else if ( have_kernel == 1 && image_kernel != image_ptr->image ) {
image_kernel = NULL; image_kernel = NULL;
have_kernel = 2; have_kernel = 2;
} }
@@ -995,7 +995,7 @@ int main(int argc, char **argv) {
if ( have_initfs == 0 ) { if ( have_initfs == 0 ) {
image_initfs = image_ptr->image; image_initfs = image_ptr->image;
have_initfs = 1; have_initfs = 1;
} else if ( have_initfs == 1 ) { } else if ( have_initfs == 1 && image_initfs != image_ptr->image ) {
image_initfs = NULL; image_initfs = NULL;
have_initfs = 2; have_initfs = 2;
} }