3 files changed, 9 insertions, 5 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 39a0d3ee..07546a39 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -81,7 +81,7 @@ RESULT eBouquet::flushChanges()
 	{
 		eServiceReference tmp = *i;
 		std::string str = tmp.path;
-		if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+		if ( i->flags&eServiceReference::canDescent )
 		{
 			unsigned int p1 = str.find("FROM BOUQUET \"");
 			if (p1 == std::string::npos)
@@ -642,7 +642,7 @@ void eDVBDB::loadBouquet(const char *path)
 					eDebug("only DVB Bouquets supported");
 					continue;
 				}
-				if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+				if ( tmp.flags&eServiceReference::canDescent )
 				{
 					unsigned int pos = tmp.path.rfind('/');
 					if ( pos != std::string::npos )
@@ -679,6 +679,8 @@ void eDVBDB::loadBouquet(const char *path)
 void eDVBDB::reloadBouquets()
 {
 	m_bouquets.clear();
+	loadBouquet("groups.tv");
+	loadBouquet("groups.radio");
 	loadBouquet("bouquets.tv");
 	loadBouquet("bouquets.radio");
 // create default bouquets when missing
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 711b5ef0..063c3771 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -529,7 +529,7 @@ int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
 
 int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-	int ret=3000;
+	int ret=30000;
 	if (m_cached_channel)
 	{
 		eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 7342a4b7..faad062f 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -144,12 +144,14 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 					if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
 						rotor = true;
 
-					ret = 1000;
+					ret=10000;
+					if (rotor && curRotorPos != -1)
+						ret -= abs(curRotorPos-sat.orbital_position);
 				}
 				else
 				{
 					csw = band;
-					ret = 2000;
+					ret = 15000;
 				}
 
 				while (linked_prev_ptr != -1)  // check for linked tuners..