--- gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp	2014/05/17 23:55:30	2558
+++ gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp	2014/06/10 22:49:45	2617
@@ -469,7 +469,7 @@
         #if DEBUG_COMBINE_INSTRUMENTS
         printf("dst "); fflush(stdout);
         #endif
-        fillDimValues(dstDimValues, dstDimCase, outRgn, true);
+        fillDimValues(dstDimValues, dstDimCase, outRgn, false);
         gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);
         gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
         #if DEBUG_COMBINE_INSTRUMENTS
@@ -505,7 +505,7 @@
             printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);
             printf("dst refilled "); fflush(stdout);
             #endif
-            fillDimValues(dstDimValues, dstDimCase, outRgn, true);
+            fillDimValues(dstDimValues, dstDimCase, outRgn, false);
             dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
             #if DEBUG_COMBINE_INSTRUMENTS
             printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);
@@ -660,7 +660,7 @@
             iTotalZones += (def) ? def->zones : 1;
         }
         #if DEBUG_COMBINE_INSTRUMENTS
-        printf("Required total zones: %d\n", iTotalZones);
+        printf("Required total zones: %d, vertical regions: %d\n", iTotalZones, itGroup->second.size());
         #endif
 
         // create all required dimensions for this output region
@@ -722,6 +722,8 @@
             #if DEBUG_COMBINE_INSTRUMENTS
             std::cout << "OK" << std::endl << std::flush;
             #endif
+        } else {
+            dims.erase(mainDimension);
         }
 
         // for the next task we need to have the current RegionGroup to be
@@ -807,15 +809,18 @@
       m_gig(gig), m_fileWasChanged(false), m_newCombinedInstrument(NULL),
       m_cancelButton(Gtk::Stock::CANCEL), m_OKButton(Gtk::Stock::OK),
       m_descriptionLabel(), m_tableDimCombo(2, 2), m_comboDimType(),
-      m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + "  ", Gtk::ALIGN_RIGHT)
+      m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + "  ", Gtk::ALIGN_END)
 {
+    m_scrolledWindow.add(m_treeView);
+    m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+
     get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK);
     get_vbox()->pack_start(m_tableDimCombo, Gtk::PACK_SHRINK);
-    get_vbox()->pack_start(m_treeView);
+    get_vbox()->pack_start(m_scrolledWindow);
     get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK);
 
 #if GTKMM_MAJOR_VERSION >= 3
-    description.set_line_wrap();
+    m_descriptionLabel.set_line_wrap();
 #endif
     m_descriptionLabel.set_text(_(
         "Select at least two instruments below that shall be combined (as "