--- libgig/trunk/src/gig.cpp	2007/03/15 13:57:47	1099
+++ libgig/trunk/src/gig.cpp	2007/04/13 16:41:18	1158
@@ -254,6 +254,30 @@
 }
 
 
+
+// *************** Other Internal functions  ***************
+// *
+
+    static split_type_t __resolveSplitType(dimension_t dimension) {
+        return (
+            dimension == dimension_layer ||
+            dimension == dimension_samplechannel ||
+            dimension == dimension_releasetrigger ||
+            dimension == dimension_keyboard ||
+            dimension == dimension_roundrobin ||
+            dimension == dimension_random ||
+            dimension == dimension_smartmidi ||
+            dimension == dimension_roundrobinkeyboard
+        ) ? split_type_bit : split_type_normal;
+    }
+
+    static int __resolveZoneSize(dimension_def_t& dimension_definition) {
+        return (dimension_definition.split_type == split_type_normal)
+        ? int(128.0 / dimension_definition.zones) : 0;
+    }
+
+
+
 // *************** Sample ***************
 // *
 
@@ -2115,18 +2139,8 @@
                     pDimensionDefinitions[i].dimension = dimension;
                     pDimensionDefinitions[i].bits      = bits;
                     pDimensionDefinitions[i].zones     = zones ? zones : 0x01 << bits; // = pow(2,bits)
-                    pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
-                                                           dimension == dimension_samplechannel ||
-                                                           dimension == dimension_releasetrigger ||
-                                                           dimension == dimension_keyboard ||
-                                                           dimension == dimension_roundrobin ||
-                                                           dimension == dimension_random ||
-                                                           dimension == dimension_smartmidi ||
-                                                           dimension == dimension_roundrobinkeyboard) ? split_type_bit
-                                                                                                      : split_type_normal;
-                    pDimensionDefinitions[i].zone_size  =
-                        (pDimensionDefinitions[i].split_type == split_type_normal) ? 128.0 / pDimensionDefinitions[i].zones
-                                                                                   : 0;
+                    pDimensionDefinitions[i].split_type = __resolveSplitType(dimension);
+                    pDimensionDefinitions[i].zone_size  = __resolveZoneSize(pDimensionDefinitions[i]);
                     Dimensions++;
 
                     // if this is a layer dimension, remember the amount of layers
@@ -2152,6 +2166,8 @@
                 if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
             }
             GetSample(); // load global region sample reference
+        } else {
+            DimensionRegions = 0;
         }
 
         // make sure there is at least one dimension region
@@ -2174,6 +2190,12 @@
      * @throws gig::Exception if samples cannot be dereferenced
      */
     void Region::UpdateChunks() {
+        // in the gig format we don't care about the Region's sample reference
+        // but we still have to provide some existing one to not corrupt the
+        // file, so to avoid the latter we simply always assign the sample of
+        // the first dimension region of this region
+        pSample = pDimensionRegions[0]->pSample;
+
         // first update base class's chunks
         DLS::Region::UpdateChunks();
 
@@ -2348,6 +2370,12 @@
         // assign definition of new dimension
         pDimensionDefinitions[Dimensions] = *pDimDef;
 
+        // auto correct certain dimension definition fields (where possible)
+        pDimensionDefinitions[Dimensions].split_type  =
+            __resolveSplitType(pDimensionDefinitions[Dimensions].dimension);
+        pDimensionDefinitions[Dimensions].zone_size =
+            __resolveZoneSize(pDimensionDefinitions[Dimensions]);
+
         // create new dimension region(s) for this new dimension
         for (int i = 1 << iCurrentBits; i < 1 << iNewBits; i++) {
             //TODO: maybe we should copy existing dimension regions if possible instead of simply creating new ones with default values
@@ -2910,7 +2938,7 @@
     void File::LoadSamples(progress_t* pProgress) {
         // Groups must be loaded before samples, because samples will try
         // to resolve the group they belong to
-        LoadGroups();
+        if (!pGroups) LoadGroups();
 
         if (!pSamples) pSamples = new SampleList;